tree 92cae0d04c72a79467a66e62bfdf542a18df2c30
parent a7da0dda39cf1e807eea1304b48d4583e7329b72
parent 282b79d7c12485ea20ff432b71290b8b992ecca8
author The Android Open Source Project <initial-contribution@android.com> 1354124855 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354124855 -0800

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

Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4