OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:54 +0000 (12:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:54 +0000 (12:16 -0800)
Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993


Trivial merge