OSDN Git Service

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

Trivial merge