OSDN Git Service

merge in master-release history after reset to 2079d768f79f636223d89b988a30209adf8dddbe
authorThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:49:49 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:49:49 +0000 (05:49 -0700)
commit04ce26531304ff251170f84e788dd83082d3b86d
tree002ff27796ef761c847078c7f05e34ce8d699310
parent2079d768f79f636223d89b988a30209adf8dddbe
parent94f5ed856215fa061a8282fa568cabffb9b4227d
merge in master-release history after reset to 2079d768f79f636223d89b988a30209adf8dddbe