diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-26 12:46:02 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-26 12:47:51 -0700 |
| commit | 0f055d11096cb02563e9c040cd03c791fd8f69a3 (patch) | |
| tree | 8c7e730f17174ab4e11786fde1c2a05c7039d507 /runtime/common_test.h | |
| parent | 93c3396f8b33539489763ebdfafcedb4127009d9 (diff) | |
| parent | 7934ac288acfb2552bb0b06ec1f61e5820d924a4 (diff) | |
| download | art-0f055d11096cb02563e9c040cd03c791fd8f69a3.zip art-0f055d11096cb02563e9c040cd03c791fd8f69a3.tar.gz art-0f055d11096cb02563e9c040cd03c791fd8f69a3.tar.bz2 | |
resolved conflicts for merge of 7934ac28 to dalvik-dev
Change-Id: I8798a6f154463d3f92f6aca62f14130aec82d273
Diffstat (limited to 'runtime/common_test.h')
| -rw-r--r-- | runtime/common_test.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/common_test.h b/runtime/common_test.h index 79710b4..2c23340 100644 --- a/runtime/common_test.h +++ b/runtime/common_test.h @@ -55,11 +55,11 @@ static const byte kBase64Map[256] = { 255, 255, 255, 255, 255, 255, 255, 62, 255, 255, 255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 255, 255, 255, 254, 255, 255, 255, 0, 1, 2, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, // NOLINT - 19, 20, 21, 22, 23, 24, 25, 255, 255, 255, 255, 255, // NOLINT + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, // NOLINT + 19, 20, 21, 22, 23, 24, 25, 255, 255, 255, 255, 255, // NOLINT 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, // NOLINT - 49, 50, 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, // NOLINT + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, // NOLINT + 49, 50, 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, // NOLINT 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, |