am 9fb84f4b: am adcea0bf: Merge "Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactory"

* commit '9fb84f4bee364d44b1d0d425109c98e964b23ae4':
  Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactory
am 00ac85fc: am 93ee28de: Merge "Fix misuses of assert in OldClassTest and comment out other libcore asserts."

* commit '00ac85fcdd54ae0b4304a662bc22f321b46bd4f5':
  Fix misuses of assert in OldClassTest and comment out other libcore asserts.
Make private static field final.

Change-Id: I3f2862e19b4a35c47e52be2158bfb45ffa30ae35
Merge "Make private static field final."
am 372334da: Merge "Make private static field final."

* commit '372334da225b4265897d193df1ea692e601fa213':
  Make private static field final.
am 990a41d3: am 372334da: Merge "Make private static field final."

* commit '990a41d3a24cdf47f62de67d791be36f042185af':
  Make private static field final.
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I87946f56204dd0e5c5779a8e0659cb88a1503d5d
am 616a8812: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '616a88127f11287ab61f7d4a53e4565dc4806d2b':
Test to verify BC Signature algorithms by OID

Bug: 7453821
Change-Id: I69408d0bb4063e34441ed1d7632fd1ccac39965b
resolved conflicts for merge of eef7e935 to jb-mr1-dev-plus-aosp

Change-Id: I1af764dffabdfa63bc383b606d0c86451bdf64dd
am df99092f: resolved conflicts for merge of eef7e935 to jb-mr1-dev-plus-aosp

* commit 'df99092f30a7bdc9f40f2fa0c3546a30d925edc0':
  Test to verify BC Signature algorithms by OID
merge in jb-mr1-release history after reset to jb-mr1-dev
Bump ThreadsTest tolerance from 5% to 10%

Bug: 7378963
Change-Id: I45fb1350baaf591e59b78bb3cf97091667cb079c
am 85c4f329: Bump ThreadsTest tolerance from 5% to 10%

* commit '85c4f329001b9837f4ad9e6ef9fdf68c2d1eb6bd':
  Bump ThreadsTest tolerance from 5% to 10%
am 388dbf5a: am 85c4f329: Bump ThreadsTest tolerance from 5% to 10%

* commit '388dbf5acfb9cb46640bd300054cc1309fdced3b':
  Bump ThreadsTest tolerance from 5% to 10%
Reconcile with jb-mr1-release - do not merge

Change-Id: If6035738d15eeca0514c2c03777200b9918721d1
am e4cc1e41: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e4cc1e41e1be985d7002272af8d07294b8537d34':
Don't create as many temporary icu4c Locale objects.

Change-Id: I70c7c178d98958633db8341e1d66931ce037c6c7
Merge "Don't create as many temporary icu4c Locale objects."
am 2ba4f42e: Merge "Don\'t create as many temporary icu4c Locale objects."

* commit '2ba4f42e6e1f7e0fb1289c2ff408e1ae153270d9':
  Don't create as many temporary icu4c Locale objects.