OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 15:33:50 +0000 (07:33 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 15:33:50 +0000 (07:33 -0800)
Change-Id: Idb85365d68dc7637fb2efd3213eacb49c0e26785


Trivial merge