OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:34:52 +0000 (13:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:34:52 +0000 (13:34 -0700)
Change-Id: I4761d711f0886ee4e81496a0068e35bcb91bf8b3


Trivial merge