OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:09:46 +0000 (19:09 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:09:46 +0000 (19:09 -0700)
commit50ec926744db8941d0c8f0d017d169d20c1ca3f4
tree7aab8d9aeca7b05eef4332995344a3d64ecf3fc9
parent2e11b0f07861c41af10b23c477cc6e89fac709ba
parentd96091d0829a0b9c93b3f02d06108e5be7851f13
Reconcile with jb-mr1-release - do not merge

Change-Id: If22290df508e894617f0acd115fe0661069dcd41