OSDN Git Service

merge in lmp-release history after reset to 7eff26a02aeb35d6c48e1af8d9bebcc838ad1fd2
authorThe Android Automerger <android-build@google.com>
Tue, 9 Sep 2014 13:13:08 +0000 (06:13 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 9 Sep 2014 13:13:08 +0000 (06:13 -0700)

Trivial merge