Brian Carlstrom 42ca4975dc am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" ...

* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding

2013-03-05 00:56:05 +00:00

..

java

am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"

2013-03-05 00:56:05 +00:00

jni

jni: net.TrafficStats: fix getIfaceStat, have it use the iface.

2013-03-04 18:53:07 +00:00

res

Import translations. DO NOT MERGE

2013-03-01 08:55:13 -08:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00