| commit | 5158363a259e5d0597bea60cb4929327bdf5afa9 | [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 | 39302472f4d2e742d5de39b24bf00c2f1f14fb10 | |
| parent | d1bfd5a29ef72342c7310c9e3128ad7d5d4a27b5 [diff] | |
| parent | 38a9779adab9d66232124ee227136de7dff7ca16 [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