OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 21:26:57 +0000 (13:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 21:26:57 +0000 (13:26 -0800)
Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5


Trivial merge