tree a55175fb8e7fc0fe518452389ff176cb93ff2f25
parent 37d8ac1b5629e3159c662a0d77503cfe85660d86
parent 8e911ec11a6f7ddbd404c18a8b096a9bf5d97273
author Geremy Condra <gcondra@google.com> 1339458822 -0700
committer android code review <noreply-gerritcodereview@google.com> 1339458823 -0700

Merge "DO NOT MERGE Add API for file origin policy."