tree b317527b1486b53fc2c52de10e266370ae35aae5
parent adbfc77c4ba01cc4a0811066e09cd6adee3b9252
parent 8784bf6fe0c34d5874db200f1dc61ab8611452e4
author The Android Open Source Project <initial-contribution@android.com> 1352925685 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352925685 -0800

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

Change-Id: I2bf1cf80a9166d9d8d574f811a6ea60f498b0f05