commit | af84c3d977f4122c39debf08f82120b66f614415 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jun 12 20:00:28 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 12 20:00:29 2017 +0000 |
tree | e171e21dbd7a3c1276c8f5335a08f5b9448d2986 | |
parent | 2daf8683f3cd26d69c30da50adc5d03cce96d130 [diff] | |
parent | c70b9917ba9ed349ac894cce3af2bf6ac84cbd3f [diff] |
Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6 -s ours am: 869f48a256" into oc-dr1-dev-plus-aosp