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:29 +0000 (08:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:34:29 +0000 (08:34 -0700)
Change-Id: Iab96df1946b1b94645b5e9f99a5bb37178987944


Trivial merge