OSDN Git Service

merge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20
authorThe Android Automerger <android-build@google.com>
Sun, 2 Nov 2014 14:10:50 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Sun, 2 Nov 2014 14:10:50 +0000 (06:10 -0800)

Trivial merge