tree 56ff1527c03a144d202dab71ed3481d1a22b70be
parent bcc59b4ad65f77df454534ff2aa5c0cee9a9a767
parent 6f66fe95d98e5c18823e78670a28eb25d04c70fd
author The Android Open Source Project <initial-contribution@android.com> 1312056749 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1312056749 -0700

Reconcile with honeycomb-LTE-release

Change-Id: I33af94011c738b572ffa3716c9346f078eea843f