OSDN Git Service

merge in master-release history after reset to d2e4281204da89a77c9c9743e5cf54a1c3e42a4a
authorThe Android Automerger <android-build@google.com>
Sat, 3 May 2014 12:51:47 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 3 May 2014 12:51:47 +0000 (05:51 -0700)
commitf3f14f72c147c2200b6a247dba366d906bbcb157
tree6d48857746b18aac1661555d5f27ec29108f0950
parentd2e4281204da89a77c9c9743e5cf54a1c3e42a4a
parent2b38c00464018d33194fb63f23a0e70d855ddc4b
merge in master-release history after reset to d2e4281204da89a77c9c9743e5cf54a1c3e42a4a