| commit | f0203313ed1cc0e30da7b817fa47a2d3e5ed48b0 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@google.com> | Fri Sep 10 15:06:40 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 10 15:06:40 2010 -0700 |
| tree | 9fcd2af248eb737279e6bb082379c88a6ab4bc04 | |
| parent | 82786f8aa72c968ba5ef609a3a4250d1d6f12cbd [diff] | |
| parent | 38f75b97d92508633c69eb6461efd353a61dab96 [diff] |
am 38f75b97: (-s ours) am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE Merge commit '38f75b97d92508633c69eb6461efd353a61dab96' * commit '38f75b97d92508633c69eb6461efd353a61dab96': This was already deprecated, but not picked up by the tool DO NOT MERGE