diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-17 17:50:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-17 17:50:20 -0700 |
| commit | a00c5f11693f880261c55f0dabf22f14799d1986 (patch) | |
| tree | 019ca26084abbcccb357df956b5df2b574c4e8e2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b725845c8b6b98b53c04a9ed7205c52593f01f06 (diff) | |
| parent | ecbb38c225831da5eccaa5af6855af86b33fbc59 (diff) | |
am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp
* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
