OSDN Git Service

merge in lmp-mr1-release history after reset to deb71b2812702318900c36b7bcfa9759525ea7cc
authorThe Android Automerger <android-build@google.com>
Mon, 29 Sep 2014 13:15:46 +0000 (06:15 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 29 Sep 2014 13:15:46 +0000 (06:15 -0700)

Trivial merge