| commit | 9ac1ec23f7a9ad61bec16960ec33635f78097441 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Sep 21 17:45:04 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 21 17:45:04 2010 -0700 |
| tree | c53ea0dbb5b4ed8eb5599aa8c364446f502bf8dc | |
| parent | 172b266ed7845eac2edc7e7f8a72371356a9a277 [diff] | |
| parent | 879585bbef51b4cabaac6340a95d807dca379cdc [diff] |
am 879585bb: (-s ours) am 701ad7cc: (-s ours) DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master Merge commit '879585bbef51b4cabaac6340a95d807dca379cdc' * commit '879585bbef51b4cabaac6340a95d807dca379cdc': DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master