OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:12:01 +0000 (10:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:12:01 +0000 (10:12 -0700)
commite6ce589266deddd541fe728a13dc97d661a7c121
tree2899c545fb49846316e84accbea99c1722ad399e
parenta1b911d3d65ef00058cc3ce04f1f6a26ec5552b7
parent86621986ec044db2c80f6d5a13c25d633c5993ba
Reconcile with jb-mr1-release - do not merge

Change-Id: Idb6548913ea9c4fc31a5b79e889274e7689f52c0