tree 6a0ef253b2ba789831490d949ddb9d3dd481cda5
parent e6ab388b7d4e26be80da2bab1efeb65986a68f38
parent 1beba23120a914aa02aa18569de0c06818bf5d09
author Jesse Hall <jessehall@google.com> 1331169731 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331169731 -0800

am 1beba231: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp

* commit '1beba23120a914aa02aa18569de0c06818bf5d09':