| commit | 5b1acf9c3e5229a4df7506e3880c17c16c53aeab | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Jun 17 19:53:45 2011 -0700 |
| committer | Jim Miller <jaggies@google.com> | Fri Jun 17 19:53:45 2011 -0700 |
| tree | ec7acd4078243ea93be1d040e7f1983e6387f994 | |
| parent | 98769300af3580723f99415bba0f790e874fb27b [diff] |
Temporary workaround for conflict in GridLayout/LockScreen. Change-Id: I0178c7f44c0fc71e78995a2565844cdb775698dd