| commit | c3d5cb6980a926c1eba44f2a0a038d6d74753267 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue May 10 10:59:29 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 10 10:59:29 2011 -0700 |
| tree | 261c846c8f09a9a6d2ea8d47db0bca9e4a8a0fb3 | |
| parent | 284797a189e64d55f49351c3811c45e5e96f5e90 [diff] | |
| parent | db05e228a4d170e644f27adc2d946558db53eb4e [diff] |
Merge "resolved conflicts for merge of 05be6d6f to master"