| commit | e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9 | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Jun 11 17:43:10 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 11 17:43:10 2012 -0700 |
| tree | dec872d967e77ef7bc311dcb851db0c3d051c346 | |
| parent | 569f5bddd2494bdeae07a6b278f6df6cc8579981 [diff] | |
| parent | b4151b296fbeb39a367bb9930d605180d683ca11 [diff] |
am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." * commit 'b4151b296fbeb39a367bb9930d605180d683ca11': DO NOT MERGE Add API for file origin policy.