GitLab

Change-Id: Ib02762546c76ff751989cd4fc8af5427c644574c

* commit '2c26c612':
  NativeCrypto: build native library standalone

* commit '9eda20c2':
  NativeCrypto: build native library standalone

Change-Id: I678f5c1b985d72ab1d41ae22dfcae35814c44e85

* commit '48269d2a':
  Fix BufferedReader.readLine to not read ahead after '\r'.

* commit 'e2aa9af9':
  Fix BufferedReader.readLine to not read ahead after '\r'.

Bug: 8778372
Change-Id: I789d0ff5498cca48b16bb7b3b363014f7b6bcf95

* commit '7fad2656':
  Tracking changes to *-host for host shared libraries

* commit 'e16c809d':
  Tracking changes to *-host for host shared libraries

Change-Id: I88dd48b09b9148246884a1c84b26787500c24569

* commit '5cd21bac':
  Add the harmony BufferedReaderTest.

* commit 'e25956bb':
  Fix ScopedStringChars to behave like ScopedUtfChars.

* commit '06ebe80b':
  Add the harmony BufferedReaderTest.

* commit '2b2224dd':
  Fix ScopedStringChars to behave like ScopedUtfChars.

Bug: 8778372
Change-Id: I10145bdfd90320da7d3ecd08404c4625495cec32

Also reformat in Google C++ style and remove a couple of unnecessary #includes.

Bug: https://code.google.com/p/android/issues/detail?id=45724
Change-Id: I6d1a78b3b1f72e7015baba64811d9749f330fba7

* commit '9f1ca92d':
  More ICU.getDateFormatOrder tests.

* commit 'ad86c68a':
  More ICU.getDateFormatOrder tests.

Bug: 7207103
Change-Id: I93a09b67d26cb61626082516a05c4b9cdda642d2

* commit '4ccedd19':
  Improve System.nanoTime documentation.

* commit 'af8bffb1':
  Improve System.nanoTime documentation.

Bug: 8733179

(cherry picked from commit 37f79a6e)

Change-Id: I8e4a860909e3f21e45e13cf9937d851a8add38c7

* commit '667623f6':
  Improve System.nanoTime documentation.

* commit 'e2c689ab':
  Improve System.nanoTime documentation.

Bug: 8733179
Change-Id: I12cf7fba00736ff1e9b2d8b2a1f5e50cf1070353

am 52bd1ee2: am db4ebcbc: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly"

* commit '52bd1ee2':
  Fix an ugly bug where try/catch offsets weren't being mapped properly

* commit 'd14543e0':
  *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev

* commit '693dfbf3':
  Manually merge "Compact merged dexes on their byte aligned size"

* commit 'b49e8eb6':
  Add missing @Override annotations

* commit 'a9e818e1':
  Fix DexMerger to emit dex files without extended op codes.

* commit '6587070a':
  Make Dex access faster by making binarySearch work.

am 66d35fb1: am 22da590f: Merge "Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill"

* commit '66d35fb1':
  Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill

* commit '725c1375':
  Improve exception detail message