OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 20:12:17 +0000 (13:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 20:12:17 +0000 (13:12 -0700)
Change-Id: I623977c46ebcdd6843dfe146e67acc1bc306982b


Trivial merge