am 6e668238: (-s ours) am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy."

Browse Source

* commit '6e66823873915bfd6e6c7b9b5c92e1e7e010977f':
  DO NOT MERGE Add API for file origin policy.

...

This commit is contained in:

Geremy Condra

2012-06-11 17:52:11 -07:00

committed by Android Git Automerger

parent 0ed6f9a01f 6e66823873

commit 3a4832aa64

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available