| commit | 6c008afd80afe79b5e6024952ee541262ceac9da | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Jun 11 17:52:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 11 17:52:11 2012 -0700 |
| tree | 245b438eac6135d6334fcc8b1dd5b042112da0c1 | |
| parent | b8f3e81dd3eeae117063fab75b13c09ffe4e1b4c [diff] | |
| parent | 59f7e90d1ab53ae207546eadbed48914be1444af [diff] |
am 59f7e90d: (-s ours) am ab217abe: (-s ours) am 27bcac31: (-s ours) Merge "DO NOT MERGE Modify browser file origin policy." * commit '59f7e90d1ab53ae207546eadbed48914be1444af': DO NOT MERGE Modify browser file origin policy.