OSDN Git Service

merge in master-release history after reset to c8e7e43a9df90bd2bdd823cdc61361427ecb4c4e
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:51:01 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:51:01 +0000 (05:51 -0700)
commit5e49a7162618ed1b9462371400d78cc0aea5d30c
tree2c919ed4316504261d4aa46e029a558e30e3e026
parentc8e7e43a9df90bd2bdd823cdc61361427ecb4c4e
parent761ab6df100049821377b7415a4147c43fc75808
merge in master-release history after reset to c8e7e43a9df90bd2bdd823cdc61361427ecb4c4e