OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:37:19 +0000 (15:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:37:19 +0000 (15:37 -0700)
Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7


Trivial merge