diff options
| author | Christopher Tate <ctate@android.com> | 2009-10-29 14:45:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 14:45:39 -0700 |
| commit | e9f5ea833363e32db4256038693775e057331a9b (patch) | |
| tree | be568663ffa03de6ff27dbf1fa65b17c200289d2 /opengl | |
| parent | 5d0b8091782374df8c764b041cf8c16079ac8aa3 (diff) | |
| parent | cda27c790adc37804ba1940c027621ab232de1b3 (diff) | |
| download | frameworks_base-e9f5ea833363e32db4256038693775e057331a9b.zip frameworks_base-e9f5ea833363e32db4256038693775e057331a9b.tar.gz frameworks_base-e9f5ea833363e32db4256038693775e057331a9b.tar.bz2 | |
am cda27c79: (-s ours) am 72c0d293: am 763ccae7: (-s ours) Merge change I8e7f5f07 into eclair
Merge commit 'cda27c790adc37804ba1940c027621ab232de1b3'
* commit 'cda27c790adc37804ba1940c027621ab232de1b3':
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions