tree 92cae0d04c72a79467a66e62bfdf542a18df2c30
parent 31e8485028e93c16312c57b5bb6b511e3bc8582d
parent d98ae61dfb3525e01420dd99f9c448163e68d0c0
author The Android Open Source Project <initial-contribution@android.com> 1354209218 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354209218 -0800

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

Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc