| commit | 67832037dbba03f34873878d3f8080ded2ec1017 | [log] [tgz] |
|---|---|---|
| author | Bjorn Bringert <bringert@android.com> | Tue Oct 12 08:24:17 2010 +0100 |
| committer | Bjorn Bringert <bringert@android.com> | Tue Oct 12 08:24:17 2010 +0100 |
| tree | c1ce98db6ef81d596f53970f44ff2ad571e0438d | |
| parent | 0c974637f4184b23f49bf7e734a17a72a9506b91 [diff] | |
| parent | 7bf3f38c493642b181f0c7ddf30b8214e50fea3b [diff] |
Merge commit '7bf3f38c493642b181f0c7ddf30b8214e50fea3b' into fix_am Fixed conflicts: src/com/android/browser/AddBookmarkPage.java src/com/android/browser/DownloadTouchIcon.java Change-Id: I06cc43e41d1a01ef68aaad5dec3923f07d165329