| commit | d9ebf24829274e38aade4dc27e8c0c64ac150b97 | [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 | f9427d1327b5002fb81f3645dd273c4f02ba646b | |
| parent | 75e15985bca0bd24ed149e6732dbf037d5b6660c [diff] | |
| parent | 952e39578d0677da6dc5f61862c3bb2a5f6398eb [diff] |
Merge "Merge commit '2f7b69aa' into manualmerge"