diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-08-11 12:46:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-11 12:46:25 -0700 |
| commit | 23f1724cf7216f6c1f58e5689034aba966e0f38b (patch) | |
| tree | 298939f61a5357c08fa528b1ed206a35b29301fb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 65adf39c3850c198f3ceac147e8ea717610f9f6c (diff) | |
| parent | 49934b48b3240267ec9378ea69d7fe04e7557f2d (diff) | |
am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
VolumePreference.onActivityStop only stops playback
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions