summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Satoshi Kataoka <satok@google.com> 2013-01-10 18:15:11 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-01-10 18:15:11 -0800
commit2495d08a5c06556deb7c3993add337037b8b492e (patch)
treeb442d37657f1b4a98462e130b13278a42e169768 /libs/hwui/OpenGLRenderer.cpp
parentd692ea6dd297fbd39885525a29bdf6637a3640f2 (diff)
parent5327322ab94711a654d41a5b53be3bf6a3a28a39 (diff)
am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
* commit '5327322ab94711a654d41a5b53be3bf6a3a28a39': 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