summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2015-10-23 17:32:40 +0000
committer android-build-merger <android-build-merger@google.com> 2015-10-23 17:32:40 +0000
commitbcc709b94d72e7f2d03d952dbf8a21b6980fd3a9 (patch)
treecf17a87325553649be202d9d15014ce54c053ba2 /libs/ui/FramebufferNativeWindow.cpp
parent69b8174c5e184d0a314821d24893e931946ede83 (diff)
parent0c11f9918c6f834f12d97315ef0247c08f8fef63 (diff)
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25
am: 0c11f9918c * commit '0c11f9918c6f834f12d97315ef0247c08f8fef63': 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