tree 02e006c44a49085c3359169c33b2dcaed4d96203
parent c4284d5f900f9436b02b253717f66528326bcf71
parent 378a16f1b9dfa31f9f8c45a8f4467e1cc10af439
author Grace Kloba <klobag@google.com> 1263319368 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263319368 -0800

am ce63c639: Merge "DO NOT MERGE." into eclair

Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.