OSDN Git Service
Elliott Hughes [Tue, 23 Jul 2013 23:37:57 +0000 (16:37 -0700)]
am
05fa5fd5: Merge "Simplify merges of the annotation code."
* commit '
05fa5fd5ce0921e8e2a8da5114c5b557434a28db':
Simplify merges of the annotation code.
Elliott Hughes [Tue, 23 Jul 2013 23:35:35 +0000 (23:35 +0000)]
Merge "Simplify merges of the annotation code."
Elliott Hughes [Tue, 23 Jul 2013 23:17:22 +0000 (16:17 -0700)]
Simplify merges of the annotation code.
Change-Id: I9fd3b53032b2e6053094500571775ed2fb5edf78
Elliott Hughes [Tue, 16 Jul 2013 22:31:38 +0000 (15:31 -0700)]
am
bc03380a: Merge "Remove an assertion that JDWP packets are small."
* commit '
bc03380a9d5565cdef0c4b4c41fdd19813b05799':
Remove an assertion that JDWP packets are small.
Elliott Hughes [Tue, 16 Jul 2013 20:45:54 +0000 (20:45 +0000)]
Merge "Remove an assertion that JDWP packets are small."
Elliott Hughes [Tue, 16 Jul 2013 20:41:03 +0000 (13:41 -0700)]
Remove an assertion that JDWP packets are small.
Now we support longer allocation tracker runs, it's possible
to collect more than 1MiB of data.
Bug:
9871848
Change-Id: Ifb575538b97563ce909f7e0aa6840ccbd6e93569
Elliott Hughes [Fri, 12 Jul 2013 01:55:50 +0000 (18:55 -0700)]
am
57914adc: am
93c3b11e: Merge "Increase the default alloc tracker maximum."
* commit '
57914adc7e0e09a74015c2dd0d3e98f1cc57e3ec':
Increase the default alloc tracker maximum.
Elliott Hughes [Fri, 12 Jul 2013 01:52:23 +0000 (18:52 -0700)]
am
93c3b11e: Merge "Increase the default alloc tracker maximum."
* commit '
93c3b11ea6bcc25e8f0bb6ba701c71ed05906b52':
Increase the default alloc tracker maximum.
Elliott Hughes [Fri, 12 Jul 2013 00:36:54 +0000 (00:36 +0000)]
Merge "Increase the default alloc tracker maximum."
Elliott Hughes [Fri, 12 Jul 2013 00:23:15 +0000 (17:23 -0700)]
Increase the default alloc tracker maximum.
Also add a new system property "dalvik.vm.allocTrackerMax" that allows
developers to choose an arbitrary limit.
Change-Id: I246a31d0ee46557544b1babae412246914495f80
Elliott Hughes [Tue, 2 Jul 2013 20:13:17 +0000 (13:13 -0700)]
am
2115c7ed: am
f8fe8731: Merge "Disable -Xjnigreflimit."
* commit '
2115c7ed027f20edca0b8e0ab819c63ff16a389c':
Disable -Xjnigreflimit.
Elliott Hughes [Tue, 2 Jul 2013 20:11:33 +0000 (13:11 -0700)]
am
f8fe8731: Merge "Disable -Xjnigreflimit."
* commit '
f8fe8731a5302105b285d549e4a0265a35db3e2e':
Disable -Xjnigreflimit.
Elliott Hughes [Tue, 2 Jul 2013 20:09:00 +0000 (20:09 +0000)]
Merge "Disable -Xjnigreflimit."
Elliott Hughes [Tue, 2 Jul 2013 19:50:29 +0000 (12:50 -0700)]
Disable -Xjnigreflimit.
This was supposed to help find bugs, but in practice (unlike the
locale reference limit and the pinned array limit) doesn't. What it
does do is cause well-behaved code to fail if its allocation rate
is high. This has caused trouble for both audio and graphics code
running on eng builds.
Bug:
7903975
Change-Id: If475cb51c9cab13270a83a60d6d0aecfab758e88
Elliott Hughes [Mon, 17 Jun 2013 17:18:54 +0000 (10:18 -0700)]
am
28702c58: am
ae2fb913: Merge "JIT: Use rsb and shift in easy multiply."
* commit '
28702c58c9af24f735091ea83243af012956099e':
JIT: Use rsb and shift in easy multiply.
Elliott Hughes [Mon, 17 Jun 2013 17:17:03 +0000 (10:17 -0700)]
am
ae2fb913: Merge "JIT: Use rsb and shift in easy multiply."
* commit '
ae2fb91351509897699a29ae54a3d120a90b62ec':
JIT: Use rsb and shift in easy multiply.
Elliott Hughes [Mon, 17 Jun 2013 17:14:21 +0000 (17:14 +0000)]
Merge "JIT: Use rsb and shift in easy multiply."
Elliott Hughes [Fri, 14 Jun 2013 17:45:27 +0000 (10:45 -0700)]
am
6fb2ea56: am
2f0ce6ab: Merge "Fix inner class access flags and array modifiers."
* commit '
6fb2ea567970f155386c6c0301a94142a954cc27':
Fix inner class access flags and array modifiers.
Elliott Hughes [Fri, 14 Jun 2013 17:44:06 +0000 (10:44 -0700)]
am
2f0ce6ab: Merge "Fix inner class access flags and array modifiers."
* commit '
2f0ce6ab114b1036b06c4bd425cd01cb509260bd':
Fix inner class access flags and array modifiers.
Elliott Hughes [Fri, 14 Jun 2013 17:41:43 +0000 (17:41 +0000)]
Merge "Fix inner class access flags and array modifiers."
Elliott Hughes [Fri, 14 Jun 2013 01:57:33 +0000 (18:57 -0700)]
Fix inner class access flags and array modifiers.
Inner class access flags should come from the InnerClass attribute.
Array classes should all have the ACC_ABSTRACT modifier set.
Bug: https://code.google.com/p/android/issues/detail?id=56267
Change-Id: If4793ee6c7a6b24bf4d32ef05167d81b58011188
Jean-Baptiste Queru [Fri, 14 Jun 2013 15:35:51 +0000 (08:35 -0700)]
am
60d1c05b: am
eb82cca7: (-s ours) am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
60d1c05bc70c5a3acf2f345cf434524aecdeab43':
Jean-Baptiste Queru [Fri, 14 Jun 2013 15:34:02 +0000 (08:34 -0700)]
am
eb82cca7: (-s ours) am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
eb82cca7f4b40bfb9aada2dfa56595d9e3ff1eda':
Anders O Nilsson [Wed, 10 Oct 2012 13:26:32 +0000 (15:26 +0200)]
JIT: Use rsb and shift in easy multiply.
For easy multiplication using reverse subtract (when
lit is 2^n-1) use the barrel shifter for rsb.
This improves arithmetic performance for code executing
in Dalvik. E.g String.hashCode.
Change-Id: Ifb086dcec344b30fd3e392ac21d508b43e820cdc
Signed-off-by: Patrik Ryd <patrik.ryd@stericsson.com>
Jean-Baptiste Queru [Fri, 14 Jun 2013 05:33:07 +0000 (22:33 -0700)]
am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
381868f347d413a671a6ad9c0af64d258a060b99':
Jean-Baptiste Queru [Fri, 14 Jun 2013 05:31:29 +0000 (22:31 -0700)]
am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
840d233c12200de9260c85d6eadbc73b41cef00b':
Jean-Baptiste Queru [Fri, 14 Jun 2013 04:07:35 +0000 (21:07 -0700)]
am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
800e4320ba0815bfe7831deab99f5d600800663f':
Jean-Baptiste Queru [Fri, 14 Jun 2013 01:07:45 +0000 (18:07 -0700)]
am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
63c34b5e2aae446b76fdf34f0ff895e35cd7376a':
Elliott Hughes [Thu, 13 Jun 2013 21:46:07 +0000 (14:46 -0700)]
am
6529809b: Merge "JIT: Allow use of cbz/cbnz for conditional branch gen."
* commit '
6529809bd4448a76622a08cf63829cab73d91b9a':
JIT: Allow use of cbz/cbnz for conditional branch gen.
Elliott Hughes [Thu, 13 Jun 2013 21:43:55 +0000 (21:43 +0000)]
Merge "JIT: Allow use of cbz/cbnz for conditional branch gen."
Elliott Hughes [Tue, 11 Jun 2013 18:03:21 +0000 (11:03 -0700)]
am
a163f4a9: Merge "Now that abort(3) is fixed, dvmAbort can be simplified."
* commit '
a163f4a944cc040aaf25f92ae9c28c1e9cf981f8':
Now that abort(3) is fixed, dvmAbort can be simplified.
Elliott Hughes [Tue, 11 Jun 2013 18:01:49 +0000 (18:01 +0000)]
Merge "Now that abort(3) is fixed, dvmAbort can be simplified."
Elliott Hughes [Tue, 11 Jun 2013 17:52:34 +0000 (10:52 -0700)]
Now that abort(3) is fixed, dvmAbort can be simplified.
The fix to abort(3) has SHA
7e6ce1a3c52d8533fed92c143419fedb0c93988a.
(https://android-review.googlesource.com/#/c/60341/)
Change-Id: I89e7ed174cbd08ad9046a98e2fdd73af8ae3ee5c
Brian Carlstrom [Fri, 7 Jun 2013 22:38:01 +0000 (15:38 -0700)]
am
6531a977: Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library."
* commit '
6531a9771a6b5bf32ea1a5febc067c8d39dede5f':
Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.
Brian Carlstrom [Fri, 7 Jun 2013 22:35:56 +0000 (22:35 +0000)]
Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library."
Elliott Hughes [Wed, 31 Aug 2011 17:29:38 +0000 (10:29 -0700)]
Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.
(cherry picked from commit
0f526895f34904784e3d2ef964b016d2764cb662)
Change-Id: I4f6f22e782e58a9b21af68aab1cebc21b3437976
Elliott Hughes [Wed, 5 Jun 2013 21:14:16 +0000 (14:14 -0700)]
am
007c01f8: Merge "Fix a minor leak in dvmCreateInlineSubsTable"
* commit '
007c01f862019fa4703cd0b3289b3cc26d4ad452':
Fix a minor leak in dvmCreateInlineSubsTable
Elliott Hughes [Wed, 5 Jun 2013 21:13:00 +0000 (21:13 +0000)]
Merge "Fix a minor leak in dvmCreateInlineSubsTable"
Elliott Hughes [Wed, 5 Jun 2013 21:11:03 +0000 (14:11 -0700)]
am
1da7fec6: Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
* commit '
1da7fec6c97623822c159ed7a8bbcce89db63119':
Fix minor leaks caused by failed initialization in JNI_CreateJavaVM
Elliott Hughes [Wed, 5 Jun 2013 21:09:03 +0000 (21:09 +0000)]
Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
Elliott Hughes [Wed, 5 Jun 2013 21:04:35 +0000 (14:04 -0700)]
am
f6944312: Merge "Fix a minor bug in dvmCreateInterpThread"
* commit '
f694431279501527cc3271d50b619533000dbd8f':
Fix a minor bug in dvmCreateInterpThread
Elliott Hughes [Wed, 5 Jun 2013 21:02:50 +0000 (21:02 +0000)]
Merge "Fix a minor bug in dvmCreateInterpThread"
Elliott Hughes [Wed, 5 Jun 2013 20:32:48 +0000 (13:32 -0700)]
am
91027c67: Merge "Remove unused compiler templates for armv7-a*"
* commit '
91027c67a3924429bc6fc94a7f28893d9d09c900':
Remove unused compiler templates for armv7-a*
Elliott Hughes [Wed, 5 Jun 2013 20:30:48 +0000 (20:30 +0000)]
Merge "Remove unused compiler templates for armv7-a*"
Elliott Hughes [Wed, 5 Jun 2013 20:23:28 +0000 (13:23 -0700)]
am
f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit '
f3079bdadf30d93b37e0a59a8787c636027a36f5':
Rename unreasonable function name dmvCompilerTemplateEnd
Elliott Hughes [Wed, 5 Jun 2013 20:22:09 +0000 (20:22 +0000)]
Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
Yanchuan Nian [Tue, 21 May 2013 02:41:51 +0000 (10:41 +0800)]
Rename unreasonable function name dmvCompilerTemplateEnd
In dalvik, most function names start with "dvm" except dmvCompilerTemplateEnd.
Convert it to dvmCompilerTemplateEnd in order to follow the rule.
Change-Id: I09c41f8c9d55058013fbdb62ac5922ccd067ce39
Brian Carlstrom [Wed, 22 May 2013 19:30:32 +0000 (12:30 -0700)]
am
8eac07c9: Merge "Move jdwpspy from development to dalvik (2 of 2)"
* commit '
8eac07c961fbdb745a36cb182d58ac83ad5ba819':
Move jdwpspy from development to dalvik (2 of 2)
Brian Carlstrom [Wed, 22 May 2013 19:22:14 +0000 (19:22 +0000)]
Merge "Move jdwpspy from development to dalvik (2 of 2)"
Brian Carlstrom [Wed, 22 May 2013 04:07:08 +0000 (21:07 -0700)]
Move jdwpspy from development to dalvik (2 of 2)
Change-Id: I3e7a255fddcec1380fce143004cbad83a69d2c0d
Jean-Philippe Lesot [Fri, 17 May 2013 07:38:04 +0000 (00:38 -0700)]
am
97208a0b: Merge "Added support for version 51 class files in dx"
* commit '
97208a0be35a4b9583172dc853150a32bb138f15':
Added support for version 51 class files in dx
Jean-Philippe Lesot [Fri, 17 May 2013 07:38:03 +0000 (00:38 -0700)]
am
467f7e3a: Merge "Report problems as errors in dx (with exit codes)"
* commit '
467f7e3aaf8aafe324744bfd825fe9941862b7b7':
Report problems as errors in dx (with exit codes)
Jean-Philippe Lesot [Fri, 17 May 2013 07:26:19 +0000 (07:26 +0000)]
Merge "Added support for version 51 class files in dx"
Jean-Philippe Lesot [Fri, 17 May 2013 07:25:05 +0000 (07:25 +0000)]
Merge "Report problems as errors in dx (with exit codes)"
You Kim [Thu, 16 May 2013 17:43:09 +0000 (02:43 +0900)]
Remove unused compiler templates for armv7-a*
Change-Id: I68e344c2f2689347d6eeb943030b7263a55cd0bd
The Android Open Source Project [Thu, 16 May 2013 12:43:00 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia4ccbf9977ed38b3283b26b2c7f889d942eebde6
delphinemartin [Fri, 26 Apr 2013 15:46:50 +0000 (17:46 +0200)]
Report problems as errors in dx (with exit codes)
(cherry picked from commit
593a7233e13d6eeb8ae5d894e29c6a27cbc7b7f0)
Change-Id: I6421f95ceb97a596a19781e46cb4767bfb21cdbd
delphinemartin [Mon, 29 Apr 2013 12:04:47 +0000 (14:04 +0200)]
Added support for version 51 class files in dx
If an invokedynamic is present, an exception is thrown.
(cherry picked from commit
94629f2a31206637fc79535ffef1b223e9f02e30)
Change-Id: I1922d4cf78465dfd2ac53f8694b7317a1d98016d
Elliott Hughes [Mon, 13 May 2013 19:04:04 +0000 (12:04 -0700)]
am
9275963e: Merge "Move verification of class access flags to libdex"
* commit '
9275963e79d1625120db610b78c3a0812ebb2922':
Move verification of class access flags to libdex
Elliott Hughes [Mon, 13 May 2013 18:50:41 +0000 (18:50 +0000)]
Merge "Move verification of class access flags to libdex"
Brian Carlstrom [Fri, 10 May 2013 14:34:18 +0000 (07:34 -0700)]
am
130eebad: Merge "Adapt dalvik to new libnativehelper"
* commit '
130eebad44c24874fb940884bfd8d9cde58dc367':
Adapt dalvik to new libnativehelper
Brian Carlstrom [Fri, 10 May 2013 14:17:33 +0000 (14:17 +0000)]
Merge "Adapt dalvik to new libnativehelper"
Brian Carlstrom [Fri, 10 May 2013 02:02:38 +0000 (19:02 -0700)]
Adapt dalvik to new libnativehelper
Change-Id: Id4707ea30c77d3760f1224fd9063c8c3f87c1ea7
Ben Gruver [Wed, 8 May 2013 20:29:36 +0000 (13:29 -0700)]
Move verification of class access flags to libdex
Change-Id: I020a168cfff46e319b0bebb6c7477f0b4139c6de
Elliott Hughes [Wed, 8 May 2013 20:26:09 +0000 (13:26 -0700)]
am
fd6ac490: Merge "Reject dex files that attempt to use unspecified class access flags"
* commit '
fd6ac49042522cbed5db0c097114a62b5201f6af':
Reject dex files that attempt to use unspecified class access flags
Elliott Hughes [Wed, 8 May 2013 18:33:58 +0000 (18:33 +0000)]
Merge "Reject dex files that attempt to use unspecified class access flags"
The Android Automerger [Wed, 8 May 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:26:50 +0000 (18:26 -0700)]
am
858dfecf: Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
* commit '
858dfecf6db216e3a9ff30b6a38a8e1bf6da6733':
Add systrace tracing for GC and thread suspension.
Jamie Gennis [Wed, 8 May 2013 01:24:29 +0000 (01:24 +0000)]
Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
Jamie Gennis [Tue, 7 May 2013 22:37:01 +0000 (15:37 -0700)]
Add systrace tracing for GC and thread suspension.
Bug:
8856374
Change-Id: I58420a14fb52eab6295381a4d8f2d59eacfe0473
Dima Zavin [Tue, 7 May 2013 08:00:20 +0000 (01:00 -0700)]
am
3b5c07d6: Merge "vm: vmruntime: remove obsolete dependency on array.h"
* commit '
3b5c07d649a15b77094d48acba07f0d8b2a366ce':
vm: vmruntime: remove obsolete dependency on array.h
Dima Zavin [Tue, 7 May 2013 07:49:03 +0000 (07:49 +0000)]
Merge "vm: vmruntime: remove obsolete dependency on array.h"
Dima Zavin [Tue, 7 May 2013 05:53:09 +0000 (22:53 -0700)]
vm: vmruntime: remove obsolete dependency on array.h
Change-Id: Ib1a0143752e701bf2f1e0b7edb4ea7829aa4edc3
Signed-off-by: Dima Zavin <dima@android.com>
Ben Gruver [Mon, 6 May 2013 17:47:25 +0000 (10:47 -0700)]
Reject dex files that attempt to use unspecified class access flags
Change-Id: Ib1ecf3dfe1856a9014c2e9b0d6a1725ba7617f98
The Android Automerger [Mon, 6 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Sat, 4 May 2013 21:19:56 +0000 (14:19 -0700)]
am
ac653462: Merge "Fix alignment when recompacting a DexMerger result."
* commit '
ac653462268d0ec88c9c3979bd8c66a23549a7d2':
Fix alignment when recompacting a DexMerger result.
Brian Carlstrom [Sat, 4 May 2013 21:11:38 +0000 (21:11 +0000)]
Merge "Fix alignment when recompacting a DexMerger result."
yroussel [Wed, 31 Oct 2012 15:25:42 +0000 (16:25 +0100)]
Fix alignment when recompacting a DexMerger result.
(cherry picked from commit
a659fe6f8a0b7d32eafc9a2ff7aa1387702da053)
Change-Id: I7c93e7d45b52655cd7adfdc3fc783757ee71079b
Brian Carlstrom [Sat, 4 May 2013 18:23:11 +0000 (11:23 -0700)]
am
647260b2: Merge "Use zero filled alignment padding before method code"
* commit '
647260b2efc139871d70bb9d25238d69615356f9':
Use zero filled alignment padding before method code
Brian Carlstrom [Sat, 4 May 2013 18:04:01 +0000 (18:04 +0000)]
Merge "Use zero filled alignment padding before method code"
Jesse Wilson [Thu, 22 Sep 2011 18:19:20 +0000 (14:19 -0400)]
Use zero filled alignment padding before method code
(cherry picked from commit
d8760772c49647ab197c34b8e46438c410decb42)
Change-Id: I092ff646b02abf7b3ee6285361e4e256c1ade37d
Brian Carlstrom [Sat, 4 May 2013 01:22:59 +0000 (18:22 -0700)]
am
1d6aa9e2: Merge "Allow the merging of more than 2 dex file at a time."
* commit '
1d6aa9e267ea8f0705b857d70fbf6c2082ce5db3':
Allow the merging of more than 2 dex file at a time.
Brian Carlstrom [Sat, 4 May 2013 01:08:34 +0000 (18:08 -0700)]
am
d1d01989: Merge "Fix bug on register compatibility."
* commit '
d1d0198958d140ee2069e6d9d5130824b27bd451':
Fix bug on register compatibility.
Brian Carlstrom [Sat, 4 May 2013 01:08:33 +0000 (18:08 -0700)]
am
f7e2a548: Merge "Remove duplicate LOCAL_MODULE_TAGS"
* commit '
f7e2a54823232a9cc249f799e666547fac0ab27d':
Remove duplicate LOCAL_MODULE_TAGS
Brian Carlstrom [Sat, 4 May 2013 01:04:46 +0000 (01:04 +0000)]
Merge "Allow the merging of more than 2 dex file at a time."
yroussel [Fri, 26 Oct 2012 13:24:56 +0000 (15:24 +0200)]
Allow the merging of more than 2 dex file at a time.
(cherry picked from commit
f9f7020a0a181ffba3bb9ed123f5bb211a61738e)
Change-Id: I2dd875399c2d30d214b6a025ffea995155ff48c1
Brian Carlstrom [Sat, 4 May 2013 01:01:46 +0000 (01:01 +0000)]
Merge "Fix bug on register compatibility."
mikaelpeltier [Mon, 8 Oct 2012 12:46:07 +0000 (14:46 +0200)]
Fix bug on register compatibility.
- Bad register usage to compute prefix or suffix expansion.
(cherry picked from commit
5bce02865087b7ec3c6321a1bef9542c18b0f90e)
Change-Id: Ife9b2b07870bbc933f959c194a4a72dfa9507cfb
Brian Carlstrom [Sat, 4 May 2013 00:54:40 +0000 (00:54 +0000)]
Merge "Remove duplicate LOCAL_MODULE_TAGS"
Brian Carlstrom [Sat, 4 May 2013 00:53:01 +0000 (17:53 -0700)]
am
ee48f542: Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
* commit '
ee48f5425c14da39e498f08b9529025fa96d62fb':
Fix bad whitespace alignment from LOGW to ALOGW change
Brian Carlstrom [Sat, 4 May 2013 00:51:51 +0000 (17:51 -0700)]
Remove duplicate LOCAL_MODULE_TAGS
Change-Id: Ib2076dedc066dab0f71b038d84edd6b60565c211
Brian Carlstrom [Sat, 4 May 2013 00:50:05 +0000 (17:50 -0700)]
resolved conflicts for merge of
c7f23a58 to jb-mr2-dev-plus-aosp
Change-Id: Ic1ff892898884326151d02a53c15f5bb4bb57c28
Brian Carlstrom [Sat, 4 May 2013 00:35:02 +0000 (00:35 +0000)]
Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
Brian Carlstrom [Sat, 4 May 2013 00:31:16 +0000 (17:31 -0700)]
Fix bad whitespace alignment from LOGW to ALOGW change
Change-Id: I8eba74b92976f433aff42e6c4461e3127e519d77
Brian Carlstrom [Sat, 4 May 2013 00:20:51 +0000 (00:20 +0000)]
Merge "Remove dx's copy of JUnit. (part II)"
Jesse Wilson [Fri, 9 Dec 2011 19:33:21 +0000 (14:33 -0500)]
Remove dx's copy of JUnit. (part II)
This is a second attempt to cherry-pick
4cd7b39876bcec03bb1d0c2afa61cbdb7d119eba
because a couple things didn't come through last time.
Change-Id: I12e5340f0504c1d875d3e4bbe23d8d5506f72fe6
Brian Carlstrom [Fri, 3 May 2013 23:10:13 +0000 (16:10 -0700)]
am
34e2dd66: Merge "Define scripts for calling DexMerger."
* commit '
34e2dd664631a974fbf92d0ad291e22d332f84cb':
Define scripts for calling DexMerger.
Brian Carlstrom [Fri, 3 May 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Define scripts for calling DexMerger."
Brian Carlstrom [Fri, 3 May 2013 22:53:35 +0000 (15:53 -0700)]
am
69fcce64: Merge "Print proto_ids_{size,off} along with the rest of the header."
* commit '
69fcce644574d25339a71cfe2c9821bbfaf8b731':
Print proto_ids_{size,off} along with the rest of the header.
yroussel [Fri, 26 Oct 2012 14:33:53 +0000 (16:33 +0200)]
Define scripts for calling DexMerger.
(cherry picked from commit
4f00f32e39f04b5b7ba6684ee3914d9904a139d5)
Change-Id: I86cedb9f48bbb8f7f1945f86b9e10bc2f37a24b9