OSDN Git Service

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


Trivial merge