OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 13 May 2013 14:51:11 +0000 (07:51 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 13 May 2013 14:51:11 +0000 (07:51 -0700)
commitad032bde047cb9df156bb88c105ca58529cea234
tree4955c1f1bb5c9600b2c276c26b82efac7ddc776a
parentf3e85d432749ca77ad707bec523b67d741d43e6e
parent300f37bcf6f632619ff0a8737a725e63bd7abaee
merge in master-release history after reset to master