tree 40663ea59319c8bb8b5805e33181208dcf474076
parent 7610962d39e36be489798ce99c3915e6224f7af4
parent fcb45380267ee587265f93681d21f3ee57085717
author The Android Open Source Project <initial-contribution@android.com> 1349362177 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349362177 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I9082ae83604084d7999efcc4929bccfa34cb3765