Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / libhwbinder / 6e5a50670a3d32347fc27f057b200f44d5d78c3e
commit6e5a50670a3d32347fc27f057b200f44d5d78c3e[log] [tgz]
authorSamuel Tan <samueltan@google.com>Wed Dec 16 18:55:58 2015 -0800
committerSamuel Tan <samueltan@google.com>Wed Dec 16 18:55:58 2015 -0800
tree83ecf4f2c7e677eb6d29c71c4db44435e078f6cb
parent73f0299490ec93e3a0135b349f620bf7b9061d0a [diff]
parentd31e23ff7f4401ef5085168bf61fd6ddf4812efc [diff]
resolve merge conflicts of ee6b4b6467 to master.

Change-Id: Ia17df264a6d7800a8fd2f0d39c2017ab48181894
tree: 83ecf4f2c7e677eb6d29c71c4db44435e078f6cb
  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. PersistableBundle.cpp
  25. ProcessInfoService.cpp
  26. ProcessState.cpp
  27. Static.cpp
  28. Status.cpp
  29. TextOutput.cpp