summaryrefslogtreecommitdiff
path: root/libs/ui/KeyLayoutMap.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-11-08 13:14:17 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-11-08 13:14:17 -0800
commitcf0cd24af5e737047c12642392a642024a85a54b (patch)
treea70022457dcbf54c8116488b7b9df1ad9c22c859 /libs/ui/KeyLayoutMap.cpp
parentd94206c41dfbac8340b86864d9e05cdc3a3a87ba (diff)
parent0b12d1460254da6997c577a3acac5a928c6d41a8 (diff)
am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
* commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9': Support post-decode video rotation.
Diffstat (limited to 'libs/ui/KeyLayoutMap.cpp')
0 files changed, 0 insertions, 0 deletions