OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:29 +0000 (05:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:29 +0000 (05:43 -0700)
Change-Id: Iec30f1654f196ebae279ebf71648a2cb44fedc4b


Trivial merge