tree 466e12697e6a9e1b558406532a17c0034bd9f408
parent 7b6c0da3292857af8f6126b9b2450dca606034e3
parent fd71c0429d4777f5b3b89d7036c9922e822f4da9
author The Android Open Source Project <initial-contribution@android.com> 1365453386 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365453386 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ia58e3622b8f48598feeae9a089adb7af125e8013