OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 29 Mar 2014 12:49:27 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 29 Mar 2014 12:49:27 +0000 (05:49 -0700)
commit30e67a7a2934c692b6c0ab6c02a78c49510cfcf5
tree2a8c7ca1008b15a2a70cdccd97bbd3631416371f
parent376c686d7e798a5c6497d9a1ab7fb4f216f2664b
parent8cb3bf208212da9cbca76e45c15856114d72e834
merge in master-release history after reset to master