Geremy Condra b7787a317f DO NOT MERGE Merge commit '8225df00' into bp ...

Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47

2013-04-18 11:40:09 -07:00

..

java

DO NOT MERGE Merge commit '8225df00' into bp

2013-04-18 11:40:09 -07:00

jni

Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

2012-10-23 15:22:37 -07:00

res

Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE

2013-01-30 12:30:03 -08:00

tests

Fix WiFi stress test

2012-10-31 17:03:23 -07:00