Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_frameworks_base / 96e62bb999e07b7bf86322928754c462f1dd1f8c
commit96e62bb999e07b7bf86322928754c462f1dd1f8c[log] [tgz]
authorandroid-build-team Robot <android-build-team-robot@google.com>Thu May 03 23:10:52 2018 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Thu May 03 23:10:52 2018 +0000
tree2f8a8daee6d34a430672d3474a2615505d3d4bea
parenta9e5b5dce041b86ca927ef76b2e21c524e3f74fb [diff]
parent6b5094b6b81f6175f4e68512ec7248670a071b7b [diff]
Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into oc-dev

* changes:
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184 am: 2b41ff76b0 skipped: 4eaa691175
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184 am: 2b41ff76b0
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1
  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