Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 338cb38cad5a1737dff1f57e13c5dbd156b882b3
commit338cb38cad5a1737dff1f57e13c5dbd156b882b3[log] [tgz]
authorEugene Susla <eugenesusla@google.com>Fri Mar 09 18:42:08 2018 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Fri Mar 09 18:42:08 2018 +0000
tree55eb9d1c3aa9c0618b214e9b402a7e6020a06299
parent28c7060b11917b79780413c804e3e922d0792231 [diff]
parentcf92266ad9094aaaad484ca1739bab3e54bb71d0 [diff]
Merge changes from topic "recognition_service-mnc-dev" into nyc-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
tree: 55eb9d1c3aa9c0618b214e9b402a7e6020a06299
  1. api/
  2. cmds/
  3. core/
  4. data/
  5. docs/
  6. drm/
  7. graphics/
  8. include/
  9. keystore/
  10. libs/
  11. location/
  12. media/
  13. native/
  14. nfc-extras/
  15. obex/
  16. opengl/
  17. packages/
  18. proto/
  19. rs/
  20. samples/
  21. sax/
  22. services/
  23. telecomm/
  24. telephony/
  25. test-runner/
  26. tests/
  27. tools/
  28. wifi/
  29. Android.mk
  30. CleanSpec.mk
  31. compiled-classes-phone
  32. MODULE_LICENSE_APACHE2
  33. NOTICE
  34. preloaded-classes