| commit | 801a3c485a07441afda183629053503a2317a334 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 14 22:51:50 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 14 22:51:50 2014 -0800 |
| tree | 15b669adc1309fa112a8e0f5789caa2bf79e6e9d | |
| parent | 61e62a74a8ddfeb6b9891bf7994303c2a61efad1 [diff] | |
| parent | fa8788856800e40e75972ec5e00cf86165ef79c2 [diff] |
am fa878885: am 1e9fa5e6: am 1745e96c: am cd508345: am 647a06ad: am 0d302278: am 69b6b56f: resolved conflicts for merge of 3c268738 to jb-dev-plus-aosp * commit 'fa8788856800e40e75972ec5e00cf86165ef79c2': FileSystemPermissionTest: Add /data/logs