OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 15 Apr 2014 12:49:58 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 15 Apr 2014 12:49:58 +0000 (05:49 -0700)
commitf8fb58c12b17527de9897c740b4504eab5384490
tree60bfe8efd85ab60b9715a2c519c4806861e01e9b
parent7f605bd4c09e2b086e69751491e25e98f4a0eb98
parent35c4b06c1daf1f1b8175cd16fed4186b2190c2e1
merge in master-release history after reset to master