Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6 -s ours" into oc-dev-plus-aosp

Browse Source

am: 7706a2fdd9

Change-Id: I7a3017bc5e23f6e2799ad979a26aadcf10ed8cbe

...

This commit is contained in:

Tao Bao 2017-06-12 20:01:58 +00:00 committed by android-build-merger

parent af84c3d977 7706a2fdd9

commit e8f0de6637

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available