OSDN Git Service

merge in jb-mr2-release history after reset to jb-mr2-dev
authorThe Android Automerger <android-build@google.com>
Thu, 30 May 2013 12:55:54 +0000 (05:55 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 30 May 2013 12:55:54 +0000 (05:55 -0700)

Trivial merge