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

* commit '66d35fb15c13da551a3130a13e293593149903fc':
  Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill
am 6587070a: am b2a9cdb4: Merge "Make Dex access faster by making binarySearch work."

* commit '6587070aa5d6da060b4b10a40f38505c8dad4595':
  Make Dex access faster by making binarySearch work.
am a9e818e1: am 0b42772c: Merge "Fix DexMerger to emit dex files without extended op codes."

* commit 'a9e818e1be628743755fb24ef6dcedbfebc7bf8b':
  Fix DexMerger to emit dex files without extended op codes.
am b49e8eb6: am 9b040f6a: Merge "Add missing @Override annotations"

* commit 'b49e8eb63f768e195869a98076dc96514f357a14':
  Add missing @Override annotations
am 693dfbf3: am 619c4ad4: Merge "Manually merge "Compact merged dexes on their byte aligned size""

* commit '693dfbf351e5b8f8faec7db8f397e14ae19b877d':
  Manually merge "Compact merged dexes on their byte aligned size"
am d14543e0: am c8bc5f77: Merge "*libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev"

* commit 'd14543e02d7d7835c1edff33c46a2c099e3b9cb1':
  *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev
am 52bd1ee2: am db4ebcbc: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly"

* commit '52bd1ee20f266688ddeb611c7aca02336fd065a7':
  Fix an ugly bug where try/catch offsets weren't being mapped properly
Improve System.nanoTime documentation.

Bug: 8733179
Change-Id: I12cf7fba00736ff1e9b2d8b2a1f5e50cf1070353
Merge "Improve System.nanoTime documentation."
am e2c689ab: Merge "Improve System.nanoTime documentation."

* commit 'e2c689ab581762cab6fdb70951b50458a30be1ee':
  Improve System.nanoTime documentation.
am 667623f6: am e2c689ab: Merge "Improve System.nanoTime documentation."

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

Bug: 8733179

(cherry picked from commit 37f79a6eb5d4f378ff6b0b56e21d5d5d1f4cc9a2)

Change-Id: I8e4a860909e3f21e45e13cf9937d851a8add38c7
am af8bffb1: Improve System.nanoTime documentation.

* commit 'af8bffb1e33737ede93acded30496b0b13254ab6':
  Improve System.nanoTime documentation.
am 4ccedd19: am af8bffb1: Improve System.nanoTime documentation.

* commit '4ccedd196d44a8bb71a8a1d29ed058d32c3f1bd1':
  Improve System.nanoTime documentation.
merge in jb-mr2-release history after reset to jb-mr2-dev
More ICU.getDateFormatOrder tests.

Bug: 7207103
Change-Id: I93a09b67d26cb61626082516a05c4b9cdda642d2
Merge "More ICU.getDateFormatOrder tests."
am ad86c68a: Merge "More ICU.getDateFormatOrder tests."

* commit 'ad86c68a7ee81bc2f1c42d3c33364b2c74132803':
  More ICU.getDateFormatOrder tests.
am 9f1ca92d: am ad86c68a: Merge "More ICU.getDateFormatOrder tests."

* commit '9f1ca92d660f42062d9bb028b588464b1fc05cd6':
  More ICU.getDateFormatOrder tests.
Fix ScopedStringChars to behave like ScopedUtfChars.

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