tree 1b992b70a01386e27844af4d8eb9a12846222067
parent 90817b8067ee76c0714b97ef93a0fab8d18b2116
parent 3a9c45cc68bf6d365b1b462433d191baa96666c5
author The Android Open Source Project <initial-contribution@android.com> 1338309661 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338309661 -0700

Reconcile with jb-release

Change-Id: I4ed461be1da6f281ce62f82e30af2f7063fef828