summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Satoshi Kataoka <satok@google.com> 2013-01-10 18:20:56 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-01-10 18:20:56 -0800
commit50fc82fdf025bc1fee8f0eb50fa88e4591c8daae (patch)
tree0162da5f2bed5ebe9501fb3c983b5b97845c289a /libs/hwui/OpenGLRenderer.cpp
parent1ec3c2ccedde5cd8ff6e94c9b1566a913d5e8db0 (diff)
parent30b074fcbff6263db4044ff4e8f36eb5d4e136eb (diff)
am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
* commit '30b074fcbff6263db4044ff4e8f36eb5d4e136eb': Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions