OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:26:28 +0000 (07:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:26:28 +0000 (07:26 -0800)
Change-Id: If2e420d2351705c4bcb89c0787951f431ebdd56d


Trivial merge