OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:45:34 +0000 (09:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:45:34 +0000 (09:45 -0700)
Change-Id: I6765f8f1401d75061c1ce4942c67bd6b4a74d286


Trivial merge