| commit | e988e0c31ca16160dee1b7c689ac31cd70fe43a2 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Jan 19 10:52:46 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 19 10:52:46 2012 -0800 |
| tree | 23e24ad56635efd8e7cbd0d0ef381bff84c0d8d4 | |
| parent | b3ca0fe66c1def11a04b18e6872318deb0340b9b [diff] | |
| parent | 3562931af97354ca028f3e1ff4bed45a9d6bfc26 [diff] |
Merge "resolved conflicts for merge of 05683c85 to master"