OSDN Git Service

merge in master-release history after reset to ca2fbf6982828562a9dee60a68d7cb4b595c430e
authorThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:50:10 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:50:10 +0000 (05:50 -0700)
commit00e1b85256eba64b18d6594a1ff0903beb407021
tree8e65f5fba02fc778a38bfc6720dce92a54ea6faa
parentca2fbf6982828562a9dee60a68d7cb4b595c430e
parent8f25b0ebb0f729deb402dffb2282d9d5f8d44e92
merge in master-release history after reset to ca2fbf6982828562a9dee60a68d7cb4b595c430e