| commit | 188d661d93c4ba4dd08f50e9ca565ea4d0d709fa | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu Aug 04 15:33:12 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 04 15:33:12 2011 -0700 |
| tree | ffbc45a64bdd52fe237c286910da569cc77d457b | |
| parent | a9307bef532e806c1ca123068ed8d902cac564b0 [diff] | |
| parent | 09337a07fa6b0d065f7292ea21c02097d3478717 [diff] |
Merge "resolved conflicts for merge of 845fdba7 to master"