summaryrefslogtreecommitdiffstats
path: root/libpixelflinger/buffer.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-27 19:35:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-27 19:35:22 +0000
commite68b4ef9b9398bb7c07d16ab5fdbdeeafe7c35fa (patch)
tree3fdb2ff2c14811427e8fbdca81840b43a45b9ba5 /libpixelflinger/buffer.h
parent622a75d5ab197c2c08bcc088f9cfabc47e278829 (diff)
parenta03656d884ff06e2e1894ba33cb3cc9afe58cf4e (diff)
downloadsystem_core-e68b4ef9b9398bb7c07d16ab5fdbdeeafe7c35fa.zip
system_core-e68b4ef9b9398bb7c07d16ab5fdbdeeafe7c35fa.tar.gz
system_core-e68b4ef9b9398bb7c07d16ab5fdbdeeafe7c35fa.tar.bz2
am a03656d8: resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aosp
* commit 'a03656d884ff06e2e1894ba33cb3cc9afe58cf4e': Lose readlink to toybox.
Diffstat (limited to 'libpixelflinger/buffer.h')
0 files changed, 0 insertions, 0 deletions