| commit | a32156124ed1525065c9ebf4d7dfc42bc6b7ccdb | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Jun 17 19:55:55 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 17 19:55:55 2011 -0700 |
| tree | 92cb55d0a32a93632598a1eb2429094d5831b99e | |
| parent | 806f006408a31854775a021d6d0776c7b889091a [diff] | |
| parent | 93de639cb129eafc1736cd5a954c1fa9b3f0ec30 [diff] |
Merge "Temporary workaround for conflict in GridLayout/LockScreen."