| commit | 51b656b597d67cc963779a47341dc859d1cb862c | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Mon May 13 11:53:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 13 11:53:58 2013 -0700 |
| tree | 2d52cd30d77ce9f2f9673f8c7a3ddda240ae3c36 | |
| parent | b716d271e9580d05cf808e997e91497406775069 [diff] | |
| parent | bad1d933efa1ebac1262377d07a0fe1869a8357c [diff] |
am bad1d933: (-s ours) 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 'bad1d933efa1ebac1262377d07a0fe1869a8357c': DO NOT MERGE. Example code for FileProvider.