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:33 +0000 (07:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:26:33 +0000 (07:26 -0800)
Change-Id: Icf259b354e115d0514bb0d6c33beffddb4bbcf35


Trivial merge