OSDN Git Service

merge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:49:37 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:49:37 +0000 (05:49 -0700)

Trivial merge