diff options
| author | Mike Lockwood <lockwood@google.com> | 2011-12-02 17:57:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 17:57:19 -0800 |
| commit | 2fe2651df02c2f02d345fcfa5d6a740435f84293 (patch) | |
| tree | c13657903573c911c2ad799dc4fbcfdb1bad6565 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4eec194c86aabeaab0df0405d41dd269f7655060 (diff) | |
| parent | f9d67a908145a20601b672d6a1c3656132fa3a65 (diff) | |
am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions