OSDN Git Service

am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file...
authorGeremy Condra <gcondra@google.com>
Tue, 12 Jun 2012 00:47:16 +0000 (17:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Jun 2012 00:47:16 +0000 (17:47 -0700)
commit6e66823873915bfd6e6c7b9b5c92e1e7e010977f
tree33d2c69127464b3cbb50e3f87351ff588710776b
parent3430959c4dce7ff5e4a8bac2f9e1c3f3a8307079
parente1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9
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.