diff options
author | Xavier Ducrohet <xav@google.com> | 2014-05-09 02:13:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 02:13:32 +0000 |
commit | 7b967dc13fa59a99c00d9b7f0c457b867ef1397f (patch) | |
tree | 76c464a7db9a900bb50304cbb498322fd6347f51 /core/tasks/oem_image.mk | |
parent | c921b1eb198a3da1fd8a1d6a378aa9b1d4d3b980 (diff) | |
parent | a6a2969e020ea16edbe24661d2b63f7f2bdf98b6 (diff) | |
download | build-7b967dc13fa59a99c00d9b7f0c457b867ef1397f.zip build-7b967dc13fa59a99c00d9b7f0c457b867ef1397f.tar.gz build-7b967dc13fa59a99c00d9b7f0c457b867ef1397f.tar.bz2 |
am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
Remove SDK Tools from platform builds.
Diffstat (limited to 'core/tasks/oem_image.mk')
0 files changed, 0 insertions, 0 deletions