| commit | cec98933e3753928d6b838805212b5ca55dffcc9 | [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 | daf4d11fbbcf2d8ac8c5f946c634cbcc51b6ef5c | |
| parent | c6ae3489277dc3cc477e997789956bc94a2302e0 [diff] | |
| parent | 25f3bcd54b1dfc8c6f076c6f6314dbea5cc87855 [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.