OSDN Git Service

merge in lmp-mr1-release history after reset to 9ca34e9ad63271958d453d5126ce6edf0e501483
authorThe Android Automerger <android-build@google.com>
Mon, 22 Sep 2014 18:14:44 +0000 (11:14 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 22 Sep 2014 18:14:44 +0000 (11:14 -0700)

Trivial merge