OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:13:36 +0000 (16:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:13:36 +0000 (16:13 -0700)
Change-Id: I0dea6d4a409899be3ba89212b1c269f61db4b453


Trivial merge