OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:52:54 +0000 (07:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:52:54 +0000 (07:52 -0700)
commitfd1c8ee2d601140bf25172be3232c6262dae3f0c
treea0654a1293a0a00f63e5a7e02319424e6d59ce64
parentb9b46a963335146effbe1ee3353a426509c9f51d
parent8f1a2d3543d7e8832144e7f3a74b62afd1f0359a
Reconcile with jb-mr1-release - do not merge

Change-Id: I919d616f469b7ec741740c5eaadc076d7aa40dcc