| commit | 1745e96ceda91a49b42f897f7705f1939cb426e7 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 14 22:42:27 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 14 22:42:27 2014 -0800 |
| tree | 88f32fb4b46b734a69c1ff28e23122c007b3a706 | |
| parent | fcaee8c51cd194badae8f510fe3d1fff26e9f838 [diff] | |
| parent | cd508345f84e6d31e9a57c156c7ef89489ead175 [diff] |
am cd508345: am 647a06ad: am 0d302278: am 69b6b56f: resolved conflicts for merge of 3c268738 to jb-dev-plus-aosp * commit 'cd508345f84e6d31e9a57c156c7ef89489ead175': FileSystemPermissionTest: Add /data/logs