summaryrefslogtreecommitdiff
path: root/libs/ui/KeyLayoutMap.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-12-01 03:37:00 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-12-01 03:37:00 -0800
commite0f66ea189b99afa31275edd84d1989a69744bd9 (patch)
treeaad37749d50f5e3bdd41946934aec27284cc4b77 /libs/ui/KeyLayoutMap.cpp
parent4191ea8c1c2392b596934aaf4cbda8ba8c3ec14e (diff)
parentfde5bc50f2f835b5f031f15fd2916a881d4f4070 (diff)
am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
* commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55': DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
Diffstat (limited to 'libs/ui/KeyLayoutMap.cpp')
0 files changed, 0 insertions, 0 deletions