commit | a3d36e998f97ae48d04667c693cf1274e586ac6e | [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 | 71c42f945bb5724e4d0d9ee76666b4884581fe8c [diff] | |
parent | 6b0cb0452a40eb147f30ebf28b6b68d8389eeffa [diff] |
am 1300b16e: am 66e39275: Merge "rootdir: init.trace.rc too early" * commit '1300b16e51045b0d1235cfaaa031228ded60924b': rootdir: init.trace.rc too early