| commit | 0d302278be807d61903cfa5d1ea7cc42c48ace9d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 14 22:29:23 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 14 22:29:23 2014 -0800 |
| tree | 41ee139ad3622c004f00b43b2e57dde213536eb1 | |
| parent | ffe9978acc6261a9c411d156f9d9407d4fc12435 [diff] | |
| parent | 69b6b56f6a5945728db165003cab18ae757780ae [diff] |
am 69b6b56f: resolved conflicts for merge of 3c268738 to jb-dev-plus-aosp * commit '69b6b56f6a5945728db165003cab18ae757780ae': FileSystemPermissionTest: Add /data/logs