OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:12 +0000 (10:46 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:12 +0000 (10:46 -0700)
Change-Id: I98befd6a263feb5235d4a8aa20abff47a2a8a097


Trivial merge