tree 76c464a7db9a900bb50304cbb498322fd6347f51
parent c921b1eb198a3da1fd8a1d6a378aa9b1d4d3b980
parent a6a2969e020ea16edbe24661d2b63f7f2bdf98b6
author Xavier Ducrohet <xav@google.com> 1399601612 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399601612 +0000

am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp

* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
  Remove SDK Tools from platform builds.