| commit | 9162e6b2f9b9f6238090dba95b8c66c8397ff25b | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Sat Nov 05 08:56:06 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Nov 05 08:56:06 2011 -0700 |
| tree | fdbde6d654c60286a33e7839037342ef8d91cf94 | |
| parent | 06ab9875c19b36ed24a21310ca5dec3ada2a6b7b [diff] | |
| parent | f434fb50a6b4c3d7f14e480ec0976b5c072b7a4c [diff] |
Merge "resolved conflicts for merge of 79178b8b to master"