Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / a9e5b5dce041b86ca927ef76b2e21c524e3f74fb
commita9e5b5dce041b86ca927ef76b2e21c524e3f74fb[log] [tgz]
authorandroid-build-team Robot <android-build-team-robot@google.com>Thu May 03 22:36:11 2018 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Thu May 03 22:36:11 2018 +0000
tree2f8a8daee6d34a430672d3474a2615505d3d4bea
parent0a7c41615e61a84c694cb11c9d146cb4bbd14ddc [diff]
parent0cf4d7cd0ce42ebc5f2395b0e8bdd34a35c5beda [diff]
Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9" into oc-dev

* changes:
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87 am: f145e8172c am: d72de1bde1 skipped: 2005cc7070
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87 am: f145e8172c am: d72de1bde1
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87 am: f145e8172c
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c
  DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
tree: 2f8a8daee6d34a430672d3474a2615505d3d4bea
  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