tree e2b8386608f1c280a82bf381394130508cc0dd03
parent 40289cde0b5936c8450cb0336dfb9d0b43d5b070
parent 3bbd867ec37df6bbc489f1a100464d47e1f36496
author Android (Google) Code Review <android-gerrit@google.com> 1250489407 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1250489407 -0700

Merge change 21469 into eclair

* changes:
  do not merge: Merged CL 21093 from goog/master to goog/eclair