OSDN Git Service

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


Trivial merge