OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:20:36 +0000 (09:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:20:36 +0000 (09:20 -0700)
Change-Id: I7cbfbab55783f245c0854543843c2052c4c2e932


Trivial merge