OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:14:04 +0000 (08:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:14:04 +0000 (08:14 -0700)
Change-Id: I5a0af2cc544c873654fb328b96b0bf1eed32d4ef


Trivial merge