Robert Greenwalt 4d9ffdf952 Merge "Add free short codes for Direct Carrier Billing and others."

2016-01-21 22:10:55 +00:00

..

java

Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"

2016-01-21 17:08:21 +00:00

jni

fix race condition between HWUI cache and renderThread

2016-01-19 15:00:42 +08:00

res

Merge "Add free short codes for Direct Carrier Billing and others."

2016-01-21 22:10:55 +00:00

tests

Use HexDump instead of java.lang.IntegralToString

2015-12-22 13:10:55 +00:00