tree 869484b41911e5599a0ff2bbffc80ea096d45e2f
parent a65a366905755a51d000b115760e88a15cb8ff2b
parent 4a1648693a5030b64715aa0dc9106b81038fe14a
author The Android Open Source Project <initial-contribution@android.com> 1354124840 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354124840 -0800

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

Change-Id: Iddf9a966691f7f0f76d3822617d2c3000ecc704f