summaryrefslogtreecommitdiffstats
path: root/opengl/java/android
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-11-16 17:50:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-16 17:50:13 -0800
commite007c0e8bc306f13149e6e099753cd110da1ec8c (patch)
tree354da64b51fa9185e68f751ae699be603a43516f /opengl/java/android
parent50a8911628a27fbbac678dd679aaafadceb65bee (diff)
parentbd7ff05e65113cd6fa5b7e0df9c7023e8cd60ac0 (diff)
downloadframeworks_base-e007c0e8bc306f13149e6e099753cd110da1ec8c.zip
frameworks_base-e007c0e8bc306f13149e6e099753cd110da1ec8c.tar.gz
frameworks_base-e007c0e8bc306f13149e6e099753cd110da1ec8c.tar.bz2
am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'bd7ff05e65113cd6fa5b7e0df9c7023e8cd60ac0': Import translations. DO NOT MERGE
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions