OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:32:49 +0000 (09:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:32:49 +0000 (09:32 -0700)
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec


Trivial merge