| commit | 92e411f6c19a2f989e1dfd33731555c773b1de38 | [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 | dda23262c8fedd883abb187f369fea84b746c67d | |
| parent | 2614952d76245aeaeee74071d8f91272d5165407 [diff] | |
| parent | 676f7e146caae83fc244ca3881031d4bc004118c [diff] |
Merge "resolved conflicts for merge of 845fdba7 to master"