commit | e8f74ae70686d3e7ab9448e2fd28892ab3add7ac | [log] [tgz] |
---|---|---|
author | Mark Salyzyn <salyzyn@google.com> | Tue Jun 02 21:33:25 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 21:33:25 2015 +0000 |
tree | 47f1ab5b73a4f434c830f4412691a9e687e110f6 | |
parent | 4282b97058d1bc5f434e9cf51afc96193f43dad4 [diff] | |
parent | c79daf522566655c5e18a62c54ae484d14de5373 [diff] |
am c79daf52: am 1300b16e: am 66e39275: Merge "rootdir: init.trace.rc too early" * commit 'c79daf522566655c5e18a62c54ae484d14de5373': rootdir: init.trace.rc too early