OSDN Git Service

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

Trivial merge