commit | 2733bd5bade3f4b3d4b9589e0c2ebe290f558ceb | [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 | 213593af8a6039c507d68bfcaf7ee6cff59cf3e6 [diff] | |
parent | ae2400631a738e98503475720cc2c54019850723 [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