OSDN Git Service

merge in lmp-mr1-release history after reset to 5e91648077f8f0765aa8628d0e99accfe2f87383
authorThe Android Automerger <android-build@google.com>
Wed, 15 Oct 2014 13:13:08 +0000 (06:13 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 15 Oct 2014 13:13:08 +0000 (06:13 -0700)

Trivial merge