Google Git
Sign in
android/platform/system/libbase/refs/heads/oreo-cts-dev
commit
e6a041fa0fc268dd05d89f25f0314c6cec62cce2
[log]
author
Steven Moreland <[email protected]>
Fri Apr 14 11:23:36 2017 -0700
committer
Steven Moreland <[email protected]>
Fri Apr 14 11:23:36 2017 -0700
tree
535d3f1c5f2755161be53bc4cc764c83cdca6c22
parent
8621b26b59bccd5821863efd8c0430d580f4e64c [diff]
libbase: fix build breakage

Two changes were merged at the same time that conflicted.

Test: builds
Change-Id: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
1 file changed
tree: 535d3f1c5f2755161be53bc4cc764c83cdca6c22
  1. include/
  2. .clang-format ⇨ ../.clang-format-2
  3. Android.bp
  4. CPPLINT.cfg
  5. endian_test.cpp
  6. errors_test.cpp
  7. errors_unix.cpp
  8. errors_windows.cpp
  9. file.cpp
  10. file_test.cpp
  11. logging.cpp
  12. logging_test.cpp
  13. parsedouble_test.cpp
  14. parseint_test.cpp
  15. parsenetaddress.cpp
  16. parsenetaddress_test.cpp
  17. properties.cpp
  18. properties_test.cpp
  19. quick_exit.cpp
  20. quick_exit_test.cpp
  21. stringprintf.cpp
  22. stringprintf_test.cpp
  23. strings.cpp
  24. strings_test.cpp
  25. test_main.cpp
  26. test_utils.cpp
  27. utf8.cpp
  28. utf8_test.cpp