diff options
| author | Martijn Coenen <maco@google.com> | 2011-10-14 13:00:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-14 13:00:45 -0700 |
| commit | 9f9418f22fa86455dfe45fa1418815c31d4258f2 (patch) | |
| tree | 3f50851414840f91b65635f12bc2173cf21d865a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c588b1616af852f620b83c8f7395ce193ea82aba (diff) | |
| parent | d2d96c5016af073a4f06b4499f681fff9486cc4f (diff) | |
am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
Remove NfcFragment from activity when no longer sharing.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions