OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 May 2013 22:28:34 +0000 (15:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 May 2013 22:28:34 +0000 (15:28 -0700)
Change-Id: I03fc6d2dac608cdc0e0c83a87cc90b821f4be52c


Trivial merge