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