OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 31 Mar 2014 12:49:09 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 31 Mar 2014 12:49:09 +0000 (05:49 -0700)
commit7b5d4c9e0709ad3780b28ab14c13404881889d00
tree2a8c7ca1008b15a2a70cdccd97bbd3631416371f
parent376c686d7e798a5c6497d9a1ab7fb4f216f2664b
parentef66c49fb94e20731b8a67a8dbcaf03b6de0e37e
merge in master-release history after reset to master