| commit | 4fb119ad0d00dc17fb1a19888d1f8529f06b14d3 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Mon Jun 12 20:04:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 12 20:04:44 2017 +0000 |
| tree | 558d040213d1ed3f853a5559ebcce59a0ee6c70b | |
| parent | d5c819643225da9aec8654799f553feb1bc6a523 [diff] | |
| parent | 2733bd5bade3f4b3d4b9589e0c2ebe290f558ceb [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 am: e8f0de6637 Change-Id: I3e4b52f016b96fec95b0b8d4c28936f4301b7cd3