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 | 9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e (patch) | |
| tree | 494e58c1d7f5285289d3dbe2a4b76214ef976a89 /opengl/java/android/opengl/Texture.java | |
| parent | 7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2 (diff) | |
| parent | 1a3ece9f871c94eb524543ae618a2a1c88cab2cd (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions