summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-21 13:47:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 13:47:08 -0700
commit46cb1d9602905061ff2a9ba3bc7654bfe94183db (patch)
tree169057f4e18f8fdfc64354d88bec8fa36590e577 /opengl
parent7df7cfebdf6a77e36692ae18f036f36b93eb45fd (diff)
parent674b856c15206a23d9d8a22fbd936a4f3055894d (diff)
downloadframeworks_base-46cb1d9602905061ff2a9ba3bc7654bfe94183db.zip
frameworks_base-46cb1d9602905061ff2a9ba3bc7654bfe94183db.tar.gz
frameworks_base-46cb1d9602905061ff2a9ba3bc7654bfe94183db.tar.bz2
am 674b856c: am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Merge commit '674b856c15206a23d9d8a22fbd936a4f3055894d' * commit '674b856c15206a23d9d8a22fbd936a4f3055894d': Fix java doc on FLAG_EXTERNAL.
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions