tree e0af1863930ab21506307984e86d44e6c0412562
parent 7a45549bbd1c206e8e5e4377c352f0b597a3e2ee
parent 5bfbcaf9dfd16442872836aa1a154ff173249654
author The Android Open Source Project <initial-contribution@android.com> 1364320401 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1364320401 -0700

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

Change-Id: I8f9de7a20cf390ce9e6fb729554a31a4be593a45