tree 8db44374c456d8629150fe944a90808982f3fd24
parent 66413b5fb59feea258caf0629fe59f46cc7b4326
parent a55ca7d7d20c1f2d1bf5be6d2cc38ec03ac175da
author The Android Open Source Project <initial-contribution@android.com> 1322690713 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322690713 -0800

am a55ca7d7: Reconcile with ics-mr1-release

* commit 'a55ca7d7d20c1f2d1bf5be6d2cc38ec03ac175da':