merge in master-release history after reset to 1dd27aa707eb14466b8e87a252bd481cdec6080c
authorThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:49:06 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:49:06 +0000 (05:49 -0700)
commit7de11aa53ef32f53e93cb76acb30d4f9e4a68397
tree6f8d51fb48c2998c0364ba98c7149b17130ed8ee
parent1dd27aa707eb14466b8e87a252bd481cdec6080c
parent1ff7b41ee8d392e5cad4b85704d4fd7cd1aa09e1
merge in master-release history after reset to 1dd27aa707eb14466b8e87a252bd481cdec6080c