OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 5 Apr 2014 12:51:37 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 5 Apr 2014 12:51:37 +0000 (05:51 -0700)
commitb2aa8ab660d814ace57deb420638b4b9ef9f47dd
treea909ad96c744fa2ab66791f99daf5be50e536bab
parent8477a30fc60b8f68cefae9d4716b852cfbb91e72
parent0c19d9e9c8ffef4161a7ea3d55755c5b34c9768f
merge in master-release history after reset to master