summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2015-10-23 21:49:18 +0000
committer android-build-merger <android-build-merger@google.com> 2015-10-23 21:49:18 +0000
commit0d2a22ece851b5ee358ac18214ccbfa28c3eb121 (patch)
tree822859b8dc3549778b189374f237249d6c8f0caf /libs/ui/FramebufferNativeWindow.cpp
parent09be485667fc96df24d2e2ab6ce4fc4f26588739 (diff)
parentbcc709b94d72e7f2d03d952dbf8a21b6980fd3a9 (diff)
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25 am: 0c11f9918c
am: bcc709b94d * commit 'bcc709b94d72e7f2d03d952dbf8a21b6980fd3a9': Maintain Parcel ABI Revert "Revert "Track ashmem memory usage in Parcel""
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions