summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Bart Sears <bsears@google.com> 2015-03-05 00:40:13 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-05 00:40:13 +0000
commit0c3052a6675ed528c2898bd2ecb92576bca78df9 (patch)
tree51666f69748c7a982a8624df2ec4f8796bfad754 /opengl/java
parentb879e7395fa9446952b840b1d576ff225b039774 (diff)
parent4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819 (diff)
am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819': Do not make ActivityContainer available to apps. DO NOT MERGE
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions