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