| commit | 6e66823873915bfd6e6c7b9b5c92e1e7e010977f | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Jun 11 17:47:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 11 17:47:16 2012 -0700 |
| tree | 33d2c69127464b3cbb50e3f87351ff588710776b | |
| parent | 3430959c4dce7ff5e4a8bac2f9e1c3f3a8307079 [diff] | |
| parent | e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9 [diff] |
am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." * commit 'e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9': DO NOT MERGE Add API for file origin policy.