Google Git
Sign in
coral/android-core/refs/heads/marshmallow-dev
commit
d239dbb2578ca70cb4cd44b78a0295bdd8af0e36
[log] [tgz]
author
Bart Sears <bsears@google.com>
Thu Aug 27 01:27:29 2015 +0000
committer
Android Git Automerger <android-git-automerger@android.com>
Thu Aug 27 01:27:29 2015 +0000
tree
26356da86e858df6d4b281f1b5f2b83a1d629d4c
parent
5b33306dba456ec906f7c9bd522681c1de137f78 [diff]
parent
170bde83ae90e03b7964edf2a00da6f83c406910 [diff]
am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev

* commit '170bde83ae90e03b7964edf2a00da6f83c406910':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
tree: 26356da86e858df6d4b281f1b5f2b83a1d629d4c
  1. adb/
  2. adf/
  3. base/
  4. cpio/
  5. debuggerd/
  6. fastboot/
  7. fingerprintd/
  8. fs_mgr/
  9. gatekeeperd/
  10. gpttool/
  11. healthd/
  12. include/
  13. init/
  14. libbacktrace/
  15. libcutils/
  16. libdiskconfig/
  17. libion/
  18. liblog/
  19. libmemtrack/
  20. libmincrypt/
  21. libnativebridge/
  22. libnetutils/
  23. libpixelflinger/
  24. libprocessgroup/
  25. libsparse/
  26. libsuspend/
  27. libsync/
  28. libsysutils/
  29. libusbhost/
  30. libutils/
  31. libziparchive/
  32. lmkd/
  33. logcat/
  34. logd/
  35. logwrapper/
  36. mkbootimg/
  37. reboot/
  38. rootdir/
  39. run-as/
  40. sdcard/
  41. toolbox/
  42. tzdatacheck/
  43. .gitignore
  44. Android.mk
  45. CleanSpec.mk
  46. MODULE_LICENSE_APACHE2
  47. NOTICE