tree 781290dc2a67566d08b26f57555fea9e80adac2d
parent eac5a25f5ff2e5c65181f9c859076e16dda7275d
parent 176805101c10d44f21a65402c9926922b20e1de0
author The Android Open Source Project <initial-contribution@android.com> 1332346140 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332346140 -0700

am 17680510: am 7967e4c0: Reconcile with ics-mr1-release

* commit '176805101c10d44f21a65402c9926922b20e1de0':