| commit | 7b967dc13fa59a99c00d9b7f0c457b867ef1397f | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Fri May 09 02:13:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 02:13:32 2014 +0000 |
| tree | 76c464a7db9a900bb50304cbb498322fd6347f51 | |
| parent | c921b1eb198a3da1fd8a1d6a378aa9b1d4d3b980 [diff] | |
| parent | a6a2969e020ea16edbe24661d2b63f7f2bdf98b6 [diff] |
am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp * commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6': Remove SDK Tools from platform builds.