OSDN Git Service

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


Trivial merge