tree 6841d5b1d696e27f66c30ede34c73d30cf5cc5c3
parent 4789a744fe0330863ad70cd3dad1bff98992c6a8
parent ecc0defdd8b671328ba3ecaa9db38e84649924a2
author Android (Google) Code Review <android-gerrit@google.com> 1250562109 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1250562109 -0700

Merge change 21655 into eclair

* changes:
  resolved conflicts for merge of 696b912e to eclair