OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:34:50 +0000 (08:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:34:50 +0000 (08:34 -0700)
Change-Id: I933252f3cee48c449df3ea2493e16d8652723ffc


Trivial merge