OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:28 +0000 (08:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:28 +0000 (08:39 -0700)
Change-Id: Icef54451c7ccec9250f3d83a84558e2ed327264b


Trivial merge