tree e20e884a0d1ca126e3836cdcec04ba2b5d19baa6
parent 941c6f7f71ba89ab8412908fed8e509c16c6a733
parent b4a96805d69b1f6281ece568b07927da2dd50872
author JP Abgrall <jpa@google.com> 1320875470 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320875470 +0000

am b4a96805: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp

* commit 'b4a96805d69b1f6281ece568b07927da2dd50872':