| commit | ab217abee18fa9a67e274f59ee5f8fc35345f3d1 | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Jun 11 17:43:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 11 17:43:12 2012 -0700 |
| tree | 36214ab3b297eeba99e6e2b1c52982a06c41ab5f | |
| parent | 501fa7284ae63fe28b8f81f403f24befa7c992dd [diff] | |
| parent | 27bcac317d3e5467c42e4014f0e5ec4d6f6ab494 [diff] |
am 27bcac31: (-s ours) Merge "DO NOT MERGE Modify browser file origin policy." * commit '27bcac317d3e5467c42e4014f0e5ec4d6f6ab494': DO NOT MERGE Modify browser file origin policy.