tree 40319fa79db50f34f91e2edc2fca9d9ad36a8bfd
parent 7bac2b5dd6c7115f4b7f73fda96b5d66a5471f41
parent 5ef16dab70975d89afe000a2deb394226130b874
author The Android Open Source Project <initial-contribution@android.com> 1354563243 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354563243 -0800

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

Change-Id: I1f1dd624a0e8cb1fd8b767acfccd092f6b81230e