| commit | cebbe7871ffc6933e164b9692ab5286e85eb4d7c | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 14 22:57:00 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 14 22:57:00 2014 -0800 |
| tree | 9e21fbe3908242bb3c0688bb493f42ae513565eb | |
| parent | 0c0585ab5bf37be11a2392fbd75528056e6e8617 [diff] | |
| parent | 04e3ec2f2d4c91ffb6634d4ab5b7e08fd9ea77ab [diff] |
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 '04e3ec2f2d4c91ffb6634d4ab5b7e08fd9ea77ab': FileSystemPermissionTest: Add /data/logs