OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 29 Mar 2014 12:51:01 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 29 Mar 2014 12:51:01 +0000 (05:51 -0700)
commit19570995906962ca2a13633b858a98cc959305b7
treeb194feca683d18d60cd491c54d69faf576568624
parent7784e3507d18ed6a4035a8d6b4688b3274e1c188
parentd8a35d9b7b8ec0a1d824bba2d28a4890c730ce84
merge in master-release history after reset to master