tree 4f9fdb149444e9fb8bf4973e5f045b4d75e3f85b
parent 8e043cd5a42071064740b111cfe08eaf720476cf
parent 66ce1fce59d2dc16f1905120e0fe3851ba1add90
author Alex Sakhartchouk <alexst@google.com> 1320082308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320082308 +0000

am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1

* commit '66ce1fce59d2dc16f1905120e0fe3851ba1add90':
  Removing changes not meant for MR1