OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:11:22 +0000 (10:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:11:22 +0000 (10:11 -0700)
Change-Id: Idb9359eee8e8aafd50f8bec1202536d842ac8cbb


Trivial merge