Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / c1da1ccdb0a383f75a7b5a7b2863f37c5c707ac6
commitc1da1ccdb0a383f75a7b5a7b2863f37c5c707ac6[log] [tgz]
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>Wed Sep 11 19:56:18 2019 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Wed Sep 11 19:56:18 2019 +0000
treef21f6c0f25d3ffe6808999878295f34851a89067
parentfa625301e646f7002be1f633164d333ecdee94be [diff]
parent37134016a617b8bbd067ed530226cac61d94d4ce [diff]
Merge changes from topic "am-673b70e5db154dbca678dcaa759eb755"

* changes:
  [automerger skipped] Merge changes from topic "protobuf-3.9.1" am: 2e928fb62a am: 89ee99a00d am: 1a1c84d6bc am: 88b8d5c8e8 -s ours am skip reason: change_id I0b101555ff604df17b2e3e06f3b3ce25adb1c9fb with SHA1 3f51ab5c82 is in history
  [automerger skipped] Adapt to google::protobuf::uint64 type change am: f74defb808 am: 595bfb9b00 am: 6b1de1743e am: 92fb855e8c -s ours am skip reason: change_id Ib2d3f4e17857f8ccbbe342ce6678e76b591df510 with SHA1 d013a88277 is in history
tree: f21f6c0f25d3ffe6808999878295f34851a89067
  1. apct-tests/
  2. apex/
  3. api/
  4. cmds/
  5. config/
  6. core/
  7. data/
  8. docs/
  9. drm/
  10. graphics/
  11. keystore/
  12. libs/
  13. location/
  14. lowpan/
  15. media/
  16. native/
  17. nfc-extras/
  18. obex/
  19. opengl/
  20. packages/
  21. proto/
  22. rs/
  23. samples/
  24. sax/
  25. services/
  26. startop/
  27. telecomm/
  28. telephony/
  29. test-base/
  30. test-legacy/
  31. test-mock/
  32. test-runner/
  33. tests/
  34. tools/
  35. wifi/
  36. .gitignore
  37. .mailmap
  38. Android.bp
  39. Android.mk
  40. CleanSpec.mk
  41. jarjar_rules_hidl.txt
  42. MODULE_LICENSE_APACHE2
  43. NOTICE
  44. pathmap.mk
  45. PREUPLOAD.cfg