Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 682c24e22811d4ee17ae1cd61bf255c3f7e722b7
commit682c24e22811d4ee17ae1cd61bf255c3f7e722b7[log] [tgz]
authorTrevor Johns <trevorjohns@google.com>Tue Apr 12 10:13:47 2016 -0700
committerTrevor Johns <trevorjohns@google.com>Tue Apr 19 02:03:59 2016 -0700
tree14ae11892022b653871ede366b09277254704f5a
parent65136ac6a4f6fb2423a0768b451782dcd0e960d5 [diff]
Resolve merge conflicts of a5060ee to nyc-dev

This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2116 files changed
tree: 14ae11892022b653871ede366b09277254704f5a
  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. MODULE_LICENSE_APACHE2
  32. NOTICE
  33. preloaded-classes