Google GitGoogle Git
Sign in
android/platform/frameworks/base/08659ccdb72b
commit
08659ccdb72b4c578e4b83fcc9e549a9c27f4b75
[log]
author
Aran Ink <nesciosquid@google.com>
Fri Jun 21 10:39:23 2019 -0400
committer
Aran Ink <nesciosquid@google.com>
Fri Jun 21 10:42:14 2019 -0400
tree
22a82a7aa94bf3bfb443b15e65173dd72db4b01e
parent
60af8df0d4153bbf0079718dbef1f248a63538ef [diff]
Fix conflict between metrics_constants and settings_enums.

Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d
Test: Automated tests pass.
Fixes: 135720071
1 file changed
tree: 22a82a7aa94bf3bfb443b15e65173dd72db4b01e
  1. apct-tests/
  2. api/
  3. cmds/
  4. config/
  5. core/
  6. data/
  7. docs/
  8. drm/
  9. graphics/
  10. keystore/
  11. libs/
  12. location/
  13. lowpan/
  14. media/
  15. native/
  16. nfc-extras/
  17. obex/
  18. opengl/
  19. packages/
  20. proto/
  21. rs/
  22. samples/
  23. sax/
  24. services/
  25. startop/
  26. telecomm/
  27. telephony/
  28. test-base/
  29. test-legacy/
  30. test-mock/
  31. test-runner/
  32. tests/
  33. tools/
  34. wifi/
  35. .gitignore
  36. Android.bp
  37. Android.mk
  38. CleanSpec.mk
  39. jarjar_rules_hidl.txt
  40. MODULE_LICENSE_APACHE2
  41. NOTICE
  42. pathmap.mk
  43. PREUPLOAD.cfg