OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:53 +0000 (12:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:54 +0000 (12:37 -0800)
Change-Id: I883abd23470b18df68c30b9307393b9b89ed0061


Trivial merge