OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:00 +0000 (07:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:00 +0000 (07:44 -0700)
Change-Id: I2ab98a5fccea49e0f4e6d22fddca485ad50b63b8


Trivial merge