diff options
author | Scott Main <smain@google.com> | 2012-03-15 11:17:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-15 11:17:27 -0700 |
commit | 6c25ffb77069a9f39884b8e91e1810254c3e2f03 (patch) | |
tree | fd9fb7b2b216a8454a9d64a185bc79e2f6cb7f14 /opengl/java | |
parent | a993d4b85a534403ed632ac6d91047478a017d59 (diff) | |
parent | 0b4ec63cd1fe09aec34d1eac8bc8f5cc28450f6c (diff) | |
download | frameworks_base-6c25ffb77069a9f39884b8e91e1810254c3e2f03.zip frameworks_base-6c25ffb77069a9f39884b8e91e1810254c3e2f03.tar.gz frameworks_base-6c25ffb77069a9f39884b8e91e1810254c3e2f03.tar.bz2 |
am 0b4ec63c: am 6513bceb: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '0b4ec63cd1fe09aec34d1eac8bc8f5cc28450f6c':
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions