| commit | a01dab5bf7a10850cddc521565cf26cc7a566dbc | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@android.com> | Fri Apr 02 12:58:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 02 12:58:27 2010 -0700 |
| tree | 2bdbfddf16f7fb26001f2f6c063eb60296770201 | |
| parent | 29a71f10098f4957d1ec7c44be81165ab24eb02d [diff] | |
| parent | 757ca14f4b58b2e3f2a98aaaf0577439aecb4e03 [diff] |
am 757ca14f: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build