diff options
| author | jsh <jsh@google.com> | 2010-09-28 16:34:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 16:34:27 -0700 |
| commit | 55673bd5f6c9fb12d1d20b6a29c4e45ad893a17e (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1bd71af7fae3e1ee6309a2132f339959c8d10d85 (diff) | |
| parent | db58f561b56ef8a8220ca0d100fb1fc7036300a9 (diff) | |
am 81102903: am 37a3631e: Merge "Add line break between PLMN and SPN in windowshade." into gingerbread
Merge commit '8110290388a68225b5dc9b5b987e4e6e583d78b2'
* commit '8110290388a68225b5dc9b5b987e4e6e583d78b2':
Add line break between PLMN and SPN in windowshade.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions