OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 21:58:18 +0000 (14:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 21:58:18 +0000 (14:58 -0700)
commitfe9a455a24a863eaf96520b761ea284cc3cd15ee
tree4e40d1faa29263342f19f30845ca76662cd5993f
parentfe50d92396f00e07bc77be1e95ffb5c8b0c989bd
parent97adb798982c68aebd758be2e2bf558a06d02b85
Reconcile with jb-mr0-release - do not merge

Change-Id: I23b8891143173a18d563ffaf2ba6aabcc30745ce