diff options
| author | Mike Lockwood <lockwood@google.com> | 2011-12-02 13:22:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 13:22:17 -0800 |
| commit | f9d67a908145a20601b672d6a1c3656132fa3a65 (patch) | |
| tree | 48623910fe75822605f4a4c5884e8b8bcd745d86 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 511c45337f38365e0fada658f8c242b17eb8291c (diff) | |
| parent | 128a09d9b1b7a5f157e56eb9f9d364cd4db05ef7 (diff) | |
am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
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