commit | 9a8d39b0a375a9d35ce14d550c5ea14aaa98904c | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Wed Jan 15 07:48:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 15 07:48:19 2014 +0000 |
tree | 158beb84d3609e2aa9fb681f0bb5241daa39ec23 | |
parent | ff03f65edfe5469a535ce09b2d170482ffe08c4d [diff] | |
parent | cebbe7871ffc6933e164b9692ab5286e85eb4d7c [diff] |
am cebbe787: am 04e3ec2f: am 801a3c48: 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 'cebbe7871ffc6933e164b9692ab5286e85eb4d7c': FileSystemPermissionTest: Add /data/logs