diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 09:15:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 09:15:41 -0700 |
| commit | f2abe4c093856e852392ce15d72d02768ed54c42 (patch) | |
| tree | 49f45d4920ff92954f3f51e6ff6a2b606dc5de1e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | df325c5325553ef6593873de1d5612fc3f1385a1 (diff) | |
| parent | d69ec09f471f9430b07da0ccf73ac6ab9a638073 (diff) | |
am 9167ba50: merge from open-source master
Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken
* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
Corrected debug message in WindowManager
Put the wifi status icon in the right place.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions