OSDN Git Service

merge in lmp-mr1-release history after reset to 9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c
authorThe Android Automerger <android-build@google.com>
Wed, 5 Nov 2014 14:13:00 +0000 (06:13 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 5 Nov 2014 14:13:00 +0000 (06:13 -0800)

Trivial merge