Stuart Scott edd33c8bdf Merge "Move reset network settings into framework."

2015-03-31 18:57:58 +00:00

..

java

Merge "Move reset network settings into framework."

2015-03-31 18:57:58 +00:00

jni

Merge "Remove unused constants in android_text_StaticLayout.cpp"

2015-03-31 17:49:31 +00:00

res

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00

tests

Keep debug information in NetworkStats files

2015-03-27 13:49:13 -07:00