tree 02e006c44a49085c3359169c33b2dcaed4d96203
parent 6f3c82e8803ef5783c42d89c5b423ea96992af53
parent 328b26836a61cc95a0bdcbec65799d263a6af254
author Grace Kloba <klobag@google.com> 1263490896 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263490896 -0800

am 196926b9: Merge "DO NOT MERGE" into eclair

Merge commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c' into eclair-plus-aosp

* commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c':
  DO NOT MERGE