OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Sep 2012 19:53:18 +0000 (12:53 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Sep 2012 19:53:18 +0000 (12:53 -0700)
commit7e8c613f823b382ecc7cab843e2920aa5dd05447
treeddb3258752535875a784b2f289563589d9c6b250
parentad8bda219e9d9b18144ace7853997c536bb2f1fc
parent4873a480f6df3f84bb3ca5c8647e9498aaf597a5
Reconcile with jb-mr0-release - do not merge

Change-Id: Icaa1aa21771c3281f508f5c90644f4b9a97c22b9