OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:27 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:27 +0000 (07:31 -0700)
commitebfa47201fcac5d4f5772ac49bef186f8fc27f89
treea2ab9f97ffbe44ecc04f294bd1b786d9d0418251
parent67f5817f1526faa64d3720c2c3d471117c520de8
parent8216609a15609b31a28f7c455c1b03caa2722ef6
Reconcile with jb-mr2-release - do not merge

Change-Id: Ib7391931437918b090222401b2ef7c3c26f0b667