commit | bad1d933efa1ebac1262377d07a0fe1869a8357c | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@google.com> | Mon May 13 11:50:34 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 13 11:50:34 2013 -0700 |
tree | 621428679ffdbcbaed25b8bea99dc58ac87e5386 | |
parent | 9b09b2789857e771e0d871b71857cfb1b9fc658d [diff] | |
parent | 9092b530518437d1f51fbd73e4cabf9666e8035d [diff] |
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.