summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Eino-Ville Talvala <etalvala@google.com> 2015-08-24 19:34:50 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-24 19:34:50 +0000
commit93826c7ebd3d5c6d6372a8bc6050d276727f7464 (patch)
treebce255d6bf0094ac179e7e81aa1d96f002773a0f /libs/hwui/Program.cpp
parent4888cdf9f60954817748ac4d69c88423f41a25a4 (diff)
parentf2c5ce5db149e320299896b1afdcb7c63378663d (diff)
am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
* commit 'f2c5ce5db149e320299896b1afdcb7c63378663d': Camera: Add support for notifying NFC stack when camera is active
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions