OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:11 +0000 (07:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:11 +0000 (07:40 -0700)
Change-Id: I204c53690f99803900e6613188a6d9a14370e007


Trivial merge