OSDN Git Service

merge in master-release history after reset to fca1b54031a1ba2a3c82bbbbe71716cd7e6a61d7
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:50:26 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:50:26 +0000 (05:50 -0700)
commit30fc16db37c654944df23d13ee36cd4656fef482
tree87a585856cf00ff6293638fbba388d2b21d04ecb
parentfca1b54031a1ba2a3c82bbbbe71716cd7e6a61d7
parent5462979df4a12dbf712c90aa09a7a85bf167533d
merge in master-release history after reset to fca1b54031a1ba2a3c82bbbbe71716cd7e6a61d7