| commit | 640487561466a65e306a7d8b6bcd65a71a72c7d5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Jan 05 14:25:54 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 05 14:25:54 2011 -0800 |
| tree | da75e8b21708cca2f0b40aaa1635f5433111ada4 | |
| parent | b9017dbe7a9bb1b191c54d246b0248b7b22d1530 [diff] | |
| parent | 97be933da2aa76acd8384e7b8420444193508133 [diff] |
am 97be933d: (-s ours) reconcile with open-source CTS - DO NOT MERGE * commit '97be933da2aa76acd8384e7b8420444193508133': reconcile with open-source CTS - DO NOT MERGE