OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 18:26:02 +0000 (11:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 18:26:02 +0000 (11:26 -0700)
Change-Id: Ia1f59a486efa98614b8f97f9432e1040c90d2ec7


Trivial merge