OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 23 Apr 2014 12:51:07 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 23 Apr 2014 12:51:07 +0000 (05:51 -0700)
commit762eb7a9ca612cec684066d83f877b957ab5fedb
tree14df0b4d272bdad4841138b5303f102a62e181e6
parent400899efa5b71bab9143a276fd3d29ecc7c2a4b5
parenta918fe8ba1e4d0cef4aadfbaa88e00b8c794c9de
merge in master-release history after reset to master