Gitiles
Code Review Sign In
review.blissroms.org / platform_system_libhwbinder / 895e117846a66c47c78a17c691e41d4b5af6f028
commit895e117846a66c47c78a17c691e41d4b5af6f028[log] [tgz]
authorChih-Hung Hsieh <chh@google.com>Thu Apr 28 09:14:32 2016 -0700
committerChih-Hung Hsieh <chh@google.com>Thu Apr 28 09:14:32 2016 -0700
treee6f3e5552068f969225df166a657dc6df9dd25e0
parentb3c571e120aeb1640f58d4a52715f5402e539528 [diff]
parent94b108169eb976cb0c4f7764a305a24e3b6b7e66 [diff]
resolve merge conflicts of 168dc86 to nyc-dev-plus-aosp

Change-Id: I1554cec6ea880a87921f723bc96972cb8e1d3c5c
tree: e6f3e5552068f969225df166a657dc6df9dd25e0
  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. IMediaResourceMonitor.cpp
  14. IMemory.cpp
  15. IPCThreadState.cpp
  16. IPermissionController.cpp
  17. IProcessInfoService.cpp
  18. IResultReceiver.cpp
  19. IServiceManager.cpp
  20. MemoryBase.cpp
  21. MemoryDealer.cpp
  22. MemoryHeapBase.cpp
  23. Parcel.cpp
  24. PermissionCache.cpp
  25. PersistableBundle.cpp
  26. ProcessInfoService.cpp
  27. ProcessState.cpp
  28. Static.cpp
  29. Status.cpp
  30. TextOutput.cpp