tree 63f5fd378c80fc9f7c33353cc9b128617229bae8
parent beaa8a4d367ec14511fe6560e2103a3f7fb9d2ad
parent 002c25eede2a33a5378c16c5bb9165179783e729
author The Android Open Source Project <initial-contribution@android.com> 1354563274 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354563274 -0800

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

Change-Id: I0aecbf7623c5ae21fd0866857f89c30c3233f4d3