Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 1d9938dc6a6dcd246cdad2929b91297d1b5d42fd
commit1d9938dc6a6dcd246cdad2929b91297d1b5d42fd[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Wed Jun 06 22:09:54 2018 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Wed Jun 06 22:09:54 2018 +0000
tree704d93cf8bbd8bb1345c142e0daedf0b8c1fca12
parentacb5b014aff541d586be942aaaf6bcfee31b2794 [diff]
parent39261639838f377a6ace67083ed41c8d12453098 [diff]
Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into nyc-dr1-dev

* changes:
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008
  ResStringPool: Prevenet boot loop from se fix
tree: 704d93cf8bbd8bb1345c142e0daedf0b8c1fca12
  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