OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 17:48:48 +0000 (09:48 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 17:48:48 +0000 (09:48 -0800)
Change-Id: I5b5f12f167d5a0287dfd21c8f37f0f451c9242a4


Trivial merge