Chad Brubaker bb670fc3ea Merge "Expose findTrustAnchorBySubjectAndPublicKey" am: 6fea66116c ...

am: 3c096b3a88

* commit '3c096b3a88617aa21bcb5cd1e496760f5898dd34':
  Expose findTrustAnchorBySubjectAndPublicKey

2015-12-01 20:27:47 +00:00

..

java

Merge "Expose findTrustAnchorBySubjectAndPublicKey" am: 6fea66116c

2015-12-01 20:27:47 +00:00

jni

Merge "Update framework code after new ART options." am: d7d2817ade

2015-11-19 16:05:01 +00:00

res

Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd

2015-11-20 01:51:01 +00:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00