OSDN Git Service

merge in lmp-release history after reset to f00945cfd7b105ad83aa0e26478681ee2ebf9bb7
authorThe Android Automerger <android-build@google.com>
Tue, 26 Aug 2014 13:12:09 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 26 Aug 2014 13:12:09 +0000 (06:12 -0700)

Trivial merge