Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / libhwbinder / 4eeb8a5c9e3a88e0176e3584d9412baa24bd745e
commit4eeb8a5c9e3a88e0176e3584d9412baa24bd745e[log] [tgz]
authorMark Salyzyn <salyzyn@google.com>Fri Dec 11 15:35:18 2015 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Fri Dec 11 15:35:18 2015 +0000
tree0128397557e2abaa64acbfaf63ce5b1f9a0089d6
parenta6822a27e55f772920d9609064fa2898ba672cba [diff]
parent11eb6a38697d5dfe7db9e3a6ac68f94f376e4517 [diff]
Merge "resolve merge conflicts of 01c1129fe6 to master."
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