summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceControl.cpp
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2013-09-17 09:02:04 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-09-17 09:02:04 -0700
commit367a2979c9423e516e30683a211a1957b8a6d854 (patch)
tree35406e4571d703d46997ffeb1384150083ec93d9 /libs/gui/SurfaceControl.cpp
parentcd9fd427ac4ee8312fd42b8e643805861d9d94b2 (diff)
parent3e08bb7668c7d57925e393f5d27db59c10ba07eb (diff)
am 3e08bb76: am fc7083a8: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
* commit '3e08bb7668c7d57925e393f5d27db59c10ba07eb': Enable FEATURE_DEVICE_ADMIN for handheld devices
Diffstat (limited to 'libs/gui/SurfaceControl.cpp')
0 files changed, 0 insertions, 0 deletions