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