OSDN Git Service

merge in lmp-mr1-release history after reset to 16410d458fdf9915dc8cb82b1bae3949a8100124
authorThe Android Automerger <android-build@google.com>
Sat, 11 Oct 2014 13:10:25 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 11 Oct 2014 13:10:25 +0000 (06:10 -0700)

Trivial merge