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