| commit | 1528c1677f36e53e0274c3776bf3c54890999460 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Feb 03 16:39:26 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 03 16:39:26 2010 -0800 |
| tree | 7892b5f3d47c12a42e854a525d2a2ec8b412cb75 | |
| parent | 17fb4b24d48274bc5c9442c1081c080c0c0e5cee [diff] | |
| parent | 38c66659ebdb6fa6cd19cbe7229c3c235b212090 [diff] |
Merge "Merge commit '2f7b69aa' into manualmerge"