summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Satoshi Kataoka <satok@google.com> 2013-01-11 10:54:31 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-01-11 10:54:31 -0800
commit9062fd8d554fe609ad6096791e5d69ceab9878fb (patch)
treebc8536c4e401455bf286482389147e140e0c966f /libs/hwui/OpenGLRenderer.cpp
parentb70d9df780b50f2aab2ff006e5cbfbd1a43ba332 (diff)
parent50fc82fdf025bc1fee8f0eb50fa88e4591c8daae (diff)
am 50fc82fd: 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 '50fc82fdf025bc1fee8f0eb50fa88e4591c8daae': 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