tree a2a6e68cc2290b115ddfa097f5007b28c263817f
parent 1509a46a860060f7630c5c58d7d08695f7350dc2
parent 42118c779555b6ae98f756ee5a5c0995b8bc709b
author The Android Open Source Project <initial-contribution@android.com> 1352234250 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352234250 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493