| commit | 6b17e7ae5b47542a46da81d20c45a9975237612e | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@android.com> | Mon Apr 05 10:57:45 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 05 10:57:45 2010 -0700 |
| tree | 2bdbfddf16f7fb26001f2f6c063eb60296770201 | |
| parent | 757ca14f4b58b2e3f2a98aaaf0577439aecb4e03 [diff] | |
| parent | 1c0cfadc909d1931b309b1a7d1d182b700fc1eab [diff] |
am 1c0cfadc: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build Merge commit '1c0cfadc909d1931b309b1a7d1d182b700fc1eab' into kraken * commit '1c0cfadc909d1931b309b1a7d1d182b700fc1eab': DO NOT MERGE. cherry pick cts change from master to fix build