diff options
| author | Wink Saville <wink@google.com> | 2010-02-19 09:32:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-19 09:32:40 -0800 |
| commit | 7506dc2633853c56b46ee3f500358ac0e2280f2d (patch) | |
| tree | e5cac38d3f9393e9d14ab5e56e66c83edcfb0378 /Android.mk | |
| parent | 3a928e46bdea32160c6cbecacdb2160389943a64 (diff) | |
| parent | 4baee90d22f02b1f31dcc7bca3bb9ad7263539ad (diff) | |
| download | android_packages_apps_Trebuchet-7506dc2633853c56b46ee3f500358ac0e2280f2d.tar.gz android_packages_apps_Trebuchet-7506dc2633853c56b46ee3f500358ac0e2280f2d.tar.bz2 android_packages_apps_Trebuchet-7506dc2633853c56b46ee3f500358ac0e2280f2d.zip | |
am 4baee90d: (-s ours) am 75dc3a9d: DO NOT MERGE; Add back support for uts testing.
Merge commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad'
* commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad':
DO NOT MERGE; Add back support for uts testing.
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions