OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 16 Apr 2014 12:49:17 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 16 Apr 2014 12:49:17 +0000 (05:49 -0700)
commit823e5cba07eebf8a036a276b3f5867589ae3f755
tree03c3c09a92f139d3b6715468c23393628388b1d5
parent105ed03cf01f2ece0aca279d4d53151b4fd4784e
parent2bce37f17fea316c0ff2118e6e80425366aa444e
merge in master-release history after reset to master