OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)
Change-Id: I666a136b9a745370acd7ed37cb78c19939d6ac00


Trivial merge