| commit | c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue May 15 10:44:29 2012 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Tue May 15 10:44:29 2012 -0700 |
| tree | 4236447a8b41fb64ec1e52b71209c6fab5c47e2d | |
| parent | 9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3 [diff] | |
| parent | 246808bedfb35ce8abd6cee434ff5b07a6618e8a [diff] |
resolved conflicts for merge of 246808be to jb-dev-plus-aosp Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089