OSDN Git Service

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


Trivial merge