summaryrefslogtreecommitdiffstats
path: root/opengl/libs/GLES2_dbg/src/server.cpp
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-04-23 21:01:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-23 21:01:35 -0700
commita8965da9886496952c6f97a402c4682ee1e37c81 (patch)
tree87e9658c6c4d38b2274d59f2444df41bf967e00f /opengl/libs/GLES2_dbg/src/server.cpp
parentf7a4cafd249d01d5b2ae5c5c7eb248ee9a511c89 (diff)
parent4a9e1a2494f2e48b157506d7c731187907b7fd4e (diff)
downloadframeworks_base-a8965da9886496952c6f97a402c4682ee1e37c81.zip
frameworks_base-a8965da9886496952c6f97a402c4682ee1e37c81.tar.gz
frameworks_base-a8965da9886496952c6f97a402c4682ee1e37c81.tar.bz2
Merge "Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult"
Diffstat (limited to 'opengl/libs/GLES2_dbg/src/server.cpp')
0 files changed, 0 insertions, 0 deletions