tree ce15ca23a9fdf16802cbae2c8aaf36a66db1aaae
parent 44145f5b7e2240357e986cabc7bb9f2ff48eaf44
parent f440fc15febefeca7b94d85619c0ce82b8f31e22
parent e342fce94ab1480c1bc4ef122f45cd328297ab98
author The Android Open Source Project <initial-contribution@android.com> 1315838806 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1315838806 -0700

Reconcile with gingerbread-release honeycomb-LTE-release

Change-Id: Ia10c7b3cda1b663ac65937929bf2c8e24539b75a