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