| commit | 1d4b6cb7d35c2a05e7123ae99d3c84f119077b2c | [log] [tgz] |
|---|---|---|
| author | Steve Block <steveblock@google.com> | Wed Nov 25 02:48:17 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 25 02:48:17 2009 -0800 |
| tree | ec2662c2667b20139fdc6b2f13fa50fcb46e2a74 | |
| parent | 3f1999925cd1d4fa1afa95a2e1a734b066959801 [diff] | |
| parent | 743cd9fcb1d94c19dba5febcd7867789ce8c5db1 [diff] |
am 743cd9fc: am 164657ef: (-s ours) Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge. Merge commit '743cd9fcb1d94c19dba5febcd7867789ce8c5db1' into eclair-mr2-plus-aosp * commit '743cd9fcb1d94c19dba5febcd7867789ce8c5db1': Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.