commit | d5c819643225da9aec8654799f553feb1bc6a523 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Mon Jun 12 20:03:37 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 12 20:03:37 2017 +0000 |
tree | 558d040213d1ed3f853a5559ebcce59a0ee6c70b | |
parent | e71d8e4b1b17188715151d824d40c9c21b0b95a6 [diff] | |
parent | 213593af8a6039c507d68bfcaf7ee6cff59cf3e6 [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 am: af84c3d977 Change-Id: I4a4e9ffea720be37dff61e444a0d4c8fed86926a