Sergio Giro d5a5d547d0 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"

2015-11-24 11:14:24 +00:00

..

java

Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"

2015-11-24 11:14:24 +00:00

jni

Update framework code after new ART options.

2015-11-19 14:31:23 +00:00

res

am e229f5dd: Merge "Text size for empty view shall be styled according to theme"

2015-10-07 16:41:30 +00:00

tests

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

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