tree 8cbae7358378fb8eae912e7add4967f8fefbd95a
parent 69cde428909e09754fc44209f68da2aead9541c6
parent 66ce1fce59d2dc16f1905120e0fe3851ba1add90
author Alex Sakhartchouk <alexst@google.com> 1320099199 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320099199 +0000

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

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