| commit | 0e0ede236b875b41f1f771a7a5501f56b9cab38f | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Thu Sep 30 13:29:36 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 30 13:29:36 2010 -0700 |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 | |
| parent | cb287544d9e342a1068d176ec21d1efdbcecf274 [diff] | |
| parent | 3a473f8661bc75479e60f5d0c5bee0dcc14ceb34 [diff] |
Merge "resolved conflicts for merge of 6e9a021e to master"