OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:34:52 +0000 (13:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:34:52 +0000 (13:34 -0700)
commit95bd5ab91211e208b1080b3fa0696b75838d7b4f
treef641f279b761815507493003f851dc628362a748
parenta730878db2afad6acd05a02e63215936dc05a6a0
parent348b71e295738457bc51e86917e200e44318b57f
Reconcile with jb-mr1-release - do not merge

Change-Id: I4761d711f0886ee4e81496a0068e35bcb91bf8b3