[go: nahoru, domu]
Google Git
Sign in
android / platform / frameworks / base / bf6bdc48491d6a9f837e5aa936b360f8aec065a5
commitbf6bdc48491d6a9f837e5aa936b360f8aec065a5[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Feb 11 23:24:38 2020 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Tue Feb 11 23:24:38 2020 +0000
tree1ff455e46a12e84312b716b6ff3df6857fdd321f
parentb75d9fdbed1d2608e052872de48880d422077756 [diff]
parent23624a7823a8099a57b0c2b20d4b39fb14ccb010 [diff]
Merge changes from topic "am-e90d0d50cdd34695a4d19e0f9412f330"

* changes:
  [automerger skipped] Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev am: bace1cd5a4 am: fcc25eb58f -s ours am skip reason: subject contains skip directive
  [automerger skipped] DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e21 am: 88904f9cf3 -s ours am skip reason: subject contains skip directive
tree: 1ff455e46a12e84312b716b6ff3df6857fdd321f
  1. apct-tests/
  2. apex/
  3. api/
  4. cmds/
  5. config/
  6. core/
  7. data/
  8. docs/
  9. drm/
  10. graphics/
  11. identity/
  12. keystore/
  13. libs/
  14. location/
  15. lowpan/
  16. media/
  17. mime/
  18. mms/
  19. native/
  20. nfc-extras/
  21. obex/
  22. opengl/
  23. packages/
  24. proto/
  25. rs/
  26. samples/
  27. sax/
  28. services/
  29. startop/
  30. telecomm/
  31. telephony/
  32. test-base/
  33. test-legacy/
  34. test-mock/
  35. test-runner/
  36. tests/
  37. tools/
  38. wifi/
  39. .clang-format
  40. .gitignore
  41. .mailmap
  42. Android.bp
  43. Android.mk
  44. ApiDocs.bp
  45. CleanSpec.mk
  46. framework-jarjar-rules.txt
  47. MODULE_LICENSE_APACHE2
  48. NOTICE
  49. pathmap.mk
  50. PREUPLOAD.cfg
  51. StubLibraries.bp
  52. TEST_MAPPING