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:45:43 +0000 (10:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:45:43 +0000 (10:45 -0700)
Change-Id: I49eb0fa91c0c510075419629195dcb27b9359e7d


Trivial merge