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