| commit | 987e8a615a54fc1d7db57170ce1afc0cbe4e15aa | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Oct 15 14:22:24 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 15 14:22:24 2010 -0700 |
| tree | 4d128e94912f83e9b49adb8fe58d7d2d06809c0c | |
| parent | bd8e69733821d6761a7c8946cd8cebb15a44babd [diff] | |
| parent | 4965e889cfe75aa7f05b8d195143a9bdbc0008b3 [diff] |
Merge "resolved conflicts for merge of 2a612605 to master"