OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 18 Jun 2013 14:49:45 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 18 Jun 2013 14:49:45 +0000 (07:49 -0700)
commitfb09b74832eb399fa8c580c3e54a2cbe2147f1c5
treee0ffa326a4291498cd75a3e6a26f20b1cbe0cb48
parent2887271ff3b59cc4bc0925ef08cea190a0017462
parent487c1b72f341d2bebf76130e40bd1267115d57f7
merge in master-release history after reset to master