OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:53:49 +0000 (11:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:53:49 +0000 (11:53 -0800)
Change-Id: Idcf1a5e4acf53a40deeb6304d83a734722c7aff4


Trivial merge