OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:18:43 +0000 (09:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:18:43 +0000 (09:18 -0700)
commit53694360600f087c1cb8e78e39451886b5cb07bf
treef17c9290e9333da3dfcc3f396c6be591ccd5f46f
parent0cc0492eaba1c3bc9626534ef75832fec51bd966
parente037cfb1bc8e39c6980ad49241572ba476285a5d
Reconcile with jb-mr1-release - do not merge

Change-Id: I9bc9016d2ef2607e2a6fd596f9c6828872e7de6f