tree 98de0952d343a23519db3a7918bff8b59cabf74b
parent 311e06bc72c3f8f1ee13c74f3be8c2126c8e0d27
parent 93f032122f0d45d565f899cc4c8f229e4ee27e89
parent 4dd1cbf09b3cfc0f60fbd73a834dd581f16a084d
author The Android Open Source Project <initial-contribution@android.com> 1305926386 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305926386 -0700

Reconcile with gingerbread-release honeycomb-release

Change-Id: I70f4170b78ed5412a4addd3c603c8ff52c8cfa0d