commit | e8f0de6637eb3e955a5a8712b43ea5540d08fa4f | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Mon Jun 12 20:01:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 12 20:01:58 2017 +0000 |
tree | e171e21dbd7a3c1276c8f5335a08f5b9448d2986 | |
parent | af84c3d977f4122c39debf08f82120b66f614415 [diff] | |
parent | 7706a2fdd921896440d0b502260841f11677089b [diff] |
Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6 -s ours" into oc-dev-plus-aosp am: 7706a2fdd9 Change-Id: I7a3017bc5e23f6e2799ad979a26aadcf10ed8cbe