OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:46 +0000 (10:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:46 +0000 (10:05 -0700)
commit32bd67c444d7ecfeaac961b73069c413f59fc7a6
treea4f52ae933206ed794e84d16e41a0b4dfe2b58c4
parent27067356afbe1842d1472b195fbe6f56d15af514
parent31b8cf81f7e9f9e1719d232c93a14aedf2049267
Reconcile with jb-mr2-release - do not merge

Change-Id: Id2611195c2e18dc743298976a1f97ecba1924974