tree 621428679ffdbcbaed25b8bea99dc58ac87e5386
parent 9b09b2789857e771e0d871b71857cfb1b9fc658d
parent 9092b530518437d1f51fbd73e4cabf9666e8035d
author Xavier Ducrohet <xav@google.com> 1368471034 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368471034 -0700

am 9092b530: am fae6eb7a: (-s ours) am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev

* commit '9092b530518437d1f51fbd73e4cabf9666e8035d':
  DO NOT MERGE. Example code for FileProvider.