tree 02e006c44a49085c3359169c33b2dcaed4d96203
parent bb1ea13390c2d0774749f8ab00decd72f6dc6e02
parent 33f00cc68c51b6f7196df229238a3855ae993e30
author Grace Kloba <klobag@google.com> 1263526359 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263526359 -0800

am d1019a99: Merge "DO NOT MERGE" into eclair

Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp

* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
  DO NOT MERGE