diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-03-06 01:39:08 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-03-06 01:39:22 +0100 |
| commit | 23328be805adafcce1146ce91d65b032c4736256 (patch) | |
| tree | d13188108ec61bc8a8eba0b104518ae1cf5f8eb4 /build | |
| parent | 312b1eb7c4df2b0dbc90576675a6c83fc9c43ca8 (diff) | |
| parent | 4a218a8b31d712290dce83cc65fc0a529fb10823 (diff) | |
| download | sdk-23328be805adafcce1146ce91d65b032c4736256.zip sdk-23328be805adafcce1146ce91d65b032c4736256.tar.gz sdk-23328be805adafcce1146ce91d65b032c4736256.tar.bz2 | |
Resolve merge conflicts of 4a218a8 to master.
Conflicts:
emulator/qtools/Android.mk
Change-Id: Ibde8886543893ce78892da57a6ab9f1fc8678432
Diffstat (limited to 'build')
| -rw-r--r-- | build/tools.atree | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/build/tools.atree b/build/tools.atree index 801c4a6..bc0389d 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -23,9 +23,7 @@ # prebuilts/devtools/tools/lib tools/lib -# manual copy of lombok-ast for now -prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1.jar tools/lib/lombok-ast.jar -prebuilts/tools/common/lombok-ast/LICENSE.txt tools/lib/lombok-ast-NOTICE.txt +prebuilts/devtools/notices/NOTICE.txt tools/NOTICE.txt prebuilts/devtools/tools/android tools/android prebuilts/devtools/tools/draw9patch tools/draw9patch @@ -37,7 +35,6 @@ prebuilts/devtools/tools/monkeyrunner tools/monkeyrunner prebuilts/devtools/tools/traceview tools/traceview prebuilts/devtools/tools/uiautomatorviewer tools/uiautomatorviewer -prebuilts/devtools/notices/NOTICE.txt tools/NOTICE.txt # version files for the SDK updater, from sdk.git |