OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:08:37 +0000 (09:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:08:37 +0000 (09:08 -0700)
commita064fa39ff593f97b084b3fdc723110bd39e4ee9
tree2751a0e1f4c27c56ad94e85957c6b3bc70acbdcb
parentfedb8a078954cf7e9b4780f5cd90bd7f827d987a
parent07d58df96e69dbe277f4dbaf92de38f35cc7482c
Reconcile with jb-mr1-release - do not merge

Change-Id: I5722eee1f2907148388f35abfa36517177ca8f50