| commit | c79daf522566655c5e18a62c54ae484d14de5373 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Jun 02 21:22:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 21:22:37 2015 +0000 |
| tree | cf6a0a506febe0d253c010d53786048ae870b6b9 | |
| parent | c573c517a9972d484c5b2ff91e190f1fb4ead9ee [diff] | |
| parent | 1300b16e51045b0d1235cfaaa031228ded60924b [diff] |
am 1300b16e: am 66e39275: Merge "rootdir: init.trace.rc too early" * commit '1300b16e51045b0d1235cfaaa031228ded60924b': rootdir: init.trace.rc too early