OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:18:16 +0000 (07:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:18:16 +0000 (07:18 -0700)
Change-Id: Ic5f4d5010eedb666a8881982067b136cdc220fa7


Trivial merge