Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / c3b4881ea50b12cc02cd9e9ab3b09b2150b63c02
commitc3b4881ea50b12cc02cd9e9ab3b09b2150b63c02[log] [tgz]
authorAtanas Kirilov <akirilov@google.com>Tue Jun 05 19:37:52 2018 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Tue Jun 05 19:37:52 2018 +0000
tree139f812c8f7409525c85c4d4c749e491036f951c
parent6064d8fd4c56d97977d37e71710edba2f7743164 [diff]
parent6e4eaec69b2461f9fafe74697ade4a0af60245c7 [diff]
Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev

* changes:
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313 am: 6be1d6713f
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008
  [automerger] Make safe label more safe am: 2263da9539
  Make safe label more safe
tree: 139f812c8f7409525c85c4d4c749e491036f951c
  1. apct-tests/
  2. api/
  3. cmds/
  4. core/
  5. data/
  6. docs/
  7. drm/
  8. graphics/
  9. keystore/
  10. legacy-test/
  11. libs/
  12. location/
  13. media/
  14. native/
  15. nfc-extras/
  16. obex/
  17. opengl/
  18. packages/
  19. proto/
  20. rs/
  21. samples/
  22. sax/
  23. services/
  24. telecomm/
  25. telephony/
  26. test-runner/
  27. tests/
  28. tools/
  29. vr/
  30. wifi/
  31. Android.bp
  32. Android.mk
  33. CleanSpec.mk
  34. compiled-classes-phone
  35. MODULE_LICENSE_APACHE2
  36. NOTICE
  37. pathmap.mk
  38. preloaded-classes
  39. PREUPLOAD.cfg