| commit | f4c8b47b8efee20583b379cf1d7e53506d891e55 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Thu Aug 02 18:38:04 2018 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Thu Aug 02 18:38:04 2018 +0900 |
| tree | 6cb74658c20ad5e44dea0ae5dcb86bf47a743e79 | |
| parent | 2ee7d5fddfd437f35159ebe0db2127913a3a85a7 [diff] | |
| parent | f93e1931b360da17cae8a9fa86a2b287b12df1d8 [diff] |
Merge QPR1.180718.001 Conflicts: init/ueventd.cpp libion/ion.c lmkd/lmkd.c rootdir/init.rc Change-Id: I05419927e27be1148cd1a2665d51f9a715ab8d47