OSDN Git Service

merge in lmp-mr1-release history after reset to 70ec2941530766bdca09ef2983a3ff794c028ee6
authorThe Android Automerger <android-build@google.com>
Wed, 29 Oct 2014 13:10:44 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 29 Oct 2014 13:10:44 +0000 (06:10 -0700)

Trivial merge