| commit | 9092b530518437d1f51fbd73e4cabf9666e8035d | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Mon May 13 11:47:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 13 11:47:24 2013 -0700 |
| tree | 0eb245b848ea2c7c921c37126cd9384f75db1485 | |
| parent | 53cc4b0b606666c51e939f4980bebd37b3befcae [diff] | |
| parent | fae6eb7aa41b4bfb59d95e5f01c1e025c137f871 [diff] |
am fae6eb7a: (-s ours) am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev * commit 'fae6eb7aa41b4bfb59d95e5f01c1e025c137f871': DO NOT MERGE. Example code for FileProvider.