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:54:36 +0000 (11:54 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:54:36 +0000 (11:54 -0800)
Change-Id: I59ea8b8ba720db95748416f5a44e385ff05cf024


Trivial merge