OSDN Git Service

merge in master-release history after reset to f88e31511ebf22aa9c39a9597830fd8635868db7
authorThe Android Automerger <android-build@google.com>
Thu, 1 May 2014 12:49:17 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 1 May 2014 12:49:17 +0000 (05:49 -0700)
commit47cb49f601d9bc09b80c8a88930826f9bf382cf8
tree14c22f9741f874c6b44e013948551ffec4a23c36
parentf88e31511ebf22aa9c39a9597830fd8635868db7
parent2973abf9e89faa1559a16c075ec69a29c93a931f
merge in master-release history after reset to f88e31511ebf22aa9c39a9597830fd8635868db7