OSDN Git Service

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

Trivial merge