OSDN Git Service

merge in master-release history after reset to 6b4e02f1cbdc55126cae9d2ce588640a784e7d61
authorThe Android Automerger <android-build@google.com>
Sun, 18 May 2014 12:49:54 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 18 May 2014 12:49:54 +0000 (05:49 -0700)

Trivial merge