Neil Fuller 4cdb25211c am 1913dc11: resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp ...

* commit '1913dc11b1bd6d23a13949f9bfa34ca3029d90a8':
  Migrate Resources.java to use ICU4j drectly.

2015-07-17 10:57:57 +00:00

..

android

am 1913dc11: resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp

2015-07-17 10:57:57 +00:00

com

am 7e89a40c: am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

2015-07-17 01:31:37 +00:00

org/apache/http

Start handshake before calling hostname verifier, part 2

2015-05-13 13:04:44 -07:00

jarjar-rules.txt

…

overview.html

…