summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Jake Hamby <jhamby@google.com> 2012-07-20 10:00:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-07-20 10:00:31 -0700
commita56d273438036d79e770efd0e436449534ee8b9b (patch)
treec9a614850b6965487fcebb78096548aad7292e23 /opengl/java
parent212dfccc74e37521f771a52c8209b049fe984793 (diff)
parent3d9a5607ba547340841bc965ac77c2589ea40da5 (diff)
am 3d9a5607: am 06d3df9a: Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony"
* commit '3d9a5607ba547340841bc965ac77c2589ea40da5': Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions