tree 814b5504d93ddee4113e41b7141f56d596c144e1
parent 9bebdff8160b70ac8b5952474207577c1c0efef5
parent a5522f48043969db24b774a1a3de93eb4c029091
author Android (Google) Code Review <android-gerrit@google.com> 1251401271 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1251401271 -0700

Merge change 22944 into eclair

* changes:
  resolved conflicts for merge of 301b97ac to eclair