OSDN Git Service

merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
authorThe Android Automerger <android-build@google.com>
Wed, 26 Jun 2013 19:17:08 +0000 (12:17 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 26 Jun 2013 19:17:08 +0000 (12:17 -0700)

Trivial merge