diff options
| author | Geremy Condra <gcondra@google.com> | 2012-06-11 17:52:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-11 17:52:11 -0700 |
| commit | 3a4832aa64db0f8b63a5e95b08d153c35749c260 (patch) | |
| tree | 7266b35c1e1b9ba65097ff7f35936d93bc8197bc /docs/html/sdk/api_diff/15/changes | |
| parent | 0ed6f9a01f8bc6f6e7575aa068fe7a8556e79613 (diff) | |
| parent | 6e66823873915bfd6e6c7b9b5c92e1e7e010977f (diff) | |
am 6e668238: (-s ours) am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy."
* commit '6e66823873915bfd6e6c7b9b5c92e1e7e010977f':
DO NOT MERGE Add API for file origin policy.
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions