| commit | 3f9f95b544c41143ab4b9ed33c75efe582717a01 | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 27 12:27:51 2009 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 27 12:27:51 2009 -0700 |
| tree | 814b5504d93ddee4113e41b7141f56d596c144e1 | |
| parent | 9bebdff8160b70ac8b5952474207577c1c0efef5 [diff] | |
| parent | a5522f48043969db24b774a1a3de93eb4c029091 [diff] |
Merge change 22944 into eclair * changes: resolved conflicts for merge of 301b97ac to eclair