OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sun, 13 Apr 2014 12:49:06 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 13 Apr 2014 12:49:06 +0000 (05:49 -0700)
commit9b41e05424a029e63d2d19461ba20ec47ad71de2
treeab32e2493c444d4618ef4c68a4d178f920ab7251
parent87cf2b5bec19adaf418704ae3beb9f5a15f07a15
parentbf713094d01e4407fdbc952bedbb9ffc25a59628
merge in master-release history after reset to master