Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / libhwbinder / 11eb6a38697d5dfe7db9e3a6ac68f94f376e4517
commit11eb6a38697d5dfe7db9e3a6ac68f94f376e4517[log] [tgz]
authorMark Salyzyn <salyzyn@google.com>Fri Dec 11 07:32:31 2015 -0800
committerMark Salyzyn <salyzyn@google.com>Fri Dec 11 07:32:31 2015 -0800
tree0128397557e2abaa64acbfaf63ce5b1f9a0089d6
parentf0def71e239fd7cbc91883a407381bdd75162552 [diff]
parent6d4da08bffab4fafab81b73d7ef20b9ffae51bfe [diff]
resolve merge conflicts of 01c1129fe6 to master.

Change-Id: I84f862b4858ecc97461750833a0e6f9cf96c34c4
tree: 0128397557e2abaa64acbfaf63ce5b1f9a0089d6
  1. include/
  2. tests/
  3. Android.mk
  4. AppOpsManager.cpp
  5. Binder.cpp
  6. BpBinder.cpp
  7. BufferedTextOutput.cpp
  8. Debug.cpp
  9. IAppOpsCallback.cpp
  10. IAppOpsService.cpp
  11. IBatteryStats.cpp
  12. IInterface.cpp
  13. IMemory.cpp
  14. IPCThreadState.cpp
  15. IPermissionController.cpp
  16. IProcessInfoService.cpp
  17. IResultReceiver.cpp
  18. IServiceManager.cpp
  19. MemoryBase.cpp
  20. MemoryDealer.cpp
  21. MemoryHeapBase.cpp
  22. Parcel.cpp
  23. PermissionCache.cpp
  24. ProcessInfoService.cpp
  25. ProcessState.cpp
  26. Static.cpp
  27. Status.cpp
  28. TextOutput.cpp