diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-10-31 16:27:34 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-10-31 16:27:34 +0100 |
| commit | 54284eb63c164d924f39f15086e55c65d8e6833f (patch) | |
| tree | 2233de38d227b7e60045b687ee6ffa1d667f5f26 /opengl/shared/OpenglCodecCommon/GLClientState.h | |
| parent | c1a91516fefca31994dc45a8a634a88eaf6a129f (diff) | |
| parent | 5a7d8f2d70c2c84f0f84c2b8d0ac3fc119935259 (diff) | |
| download | android_device_generic_goldfish-54284eb63c164d924f39f15086e55c65d8e6833f.tar.gz android_device_generic_goldfish-54284eb63c164d924f39f15086e55c65d8e6833f.tar.bz2 android_device_generic_goldfish-54284eb63c164d924f39f15086e55c65d8e6833f.zip | |
resolved conflicts for merge of 5a7d8f2d to stage-aosp-master
Change-Id: I4ce3cee422f8e98d70bbf2ffcaac34650c7182b4
Diffstat (limited to 'opengl/shared/OpenglCodecCommon/GLClientState.h')
0 files changed, 0 insertions, 0 deletions