OSDN Git Service

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

Trivial merge