| commit | 93f9e1ca1ce2e5456f0a4f0090a7b2a8a473cf36 | [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 | 122a1938f824d4175e699d2092b6540c36a9d404 | |
| parent | 94c9f39ece18183c3ad2ad224ddb4690e3dd5045 [diff] | |
| parent | 5b1acf9c3e5229a4df7506e3880c17c16c53aeab [diff] |
Merge "Temporary workaround for conflict in GridLayout/LockScreen."