summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Santos Cordon <santoscordon@google.com> 2014-03-06 02:40:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-06 02:40:10 +0000
commit2fab2f63676af8a8f45fd303b255c88761c4f224 (patch)
tree37e3b7c742cde12a9230a91b6200f89d65b289e5 /opengl/java
parent6daf22ca7680261e07dfd298a43d6e473e6c06f6 (diff)
parent91d59ad18c441fce65f36314b4bc10aece3c0c4f (diff)
am 91d59ad1: am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev
* commit '91d59ad18c441fce65f36314b4bc10aece3c0c4f': Update permission description string.
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions