tree 2ec8a0d8766596c7a4488a0cb32cd2d678daf71a
parent 39bf4a89856ac726e3b69a9729b98ec1531f019c
parent f16d590bf10dacca4839d700badb8347ca3dcb75
author The Android Open Source Project <initial-contribution@android.com> 1341445722 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1341445722 -0700

Reconcile with jb-release

Change-Id: If011f17e59472216d18a51e9054d50c09f0068d4