tree a116dfd1bf85ba3d8b7dfc59211cc812382a9e8b
parent 9db7f33c40eab954e8ea739becd19b8ce52bdd9d
parent 10553853707b4cf866b07d244ad275acbdc90b7c
author The Android Open Source Project <initial-contribution@android.com> 1364320396 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1364320396 -0700

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

Change-Id: I12228df608aebe82af2aac17f181deafc1729d0e