OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:30 +0000 (12:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:30 +0000 (12:37 -0800)
commitc2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e
treea2a6e68cc2290b115ddfa097f5007b28c263817f
parent1509a46a860060f7630c5c58d7d08695f7350dc2
parent42118c779555b6ae98f756ee5a5c0995b8bc709b
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493