| commit | 43c37acece6a4dbff8e942b1c1bb4472f562df2c | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Jun 03 15:51:56 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 03 15:51:56 2011 -0700 |
| tree | 23f458f7b2bf07089e03934403762efdce4f4e3b | |
| parent | cc0fd378207e27682f86a6f3c4030fcb225894f5 [diff] | |
| parent | bcc45f952b0fc42f474cb98ddd863b1696ef7983 [diff] |
Merge "resolved conflicts for merge of ca2b552d to master"