Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / libhwbinder / ec21233fcbc0eebd7669c2df6e5e863d4e75e542
commitec21233fcbc0eebd7669c2df6e5e863d4e75e542[log] [tgz]
authorAlex Cheung <alexcheung@google.com>Wed Dec 23 14:49:50 2015 -0800
committerAlex Cheung <alexcheung@google.com>Wed Dec 23 14:49:50 2015 -0800
tree7da78caaf636509f6cf6bae184734392a2998f81
parent3a6e0d29c176481f4fac927d82fed4dfde112896 [diff]
parentbcd60620c85de6c3b9ae941068a20a2cb14a87ad [diff]
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
tree: 7da78caaf636509f6cf6bae184734392a2998f81
  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