OSDN Git Service

merge in master-release history after reset to 0e0122a9999eb1a603c99be12846acad29ed0593
authorThe Android Automerger <android-build@google.com>
Sat, 3 May 2014 12:51:24 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 3 May 2014 12:51:24 +0000 (05:51 -0700)

Trivial merge