Jeff Brown 047f3c71a4 resolved conflicts for merge of 3ee9dc58 to master ...

Change-Id: Idd045d01246367b77718210c8b6665110da58ac4

2014-04-16 14:18:49 -07:00

..

java

resolved conflicts for merge of 3ee9dc58 to master

2014-04-16 14:18:49 -07:00

jni

am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"

2014-04-16 19:58:26 +00:00

res

Stub APIs for network scoring.

2014-04-16 11:55:14 -07:00

tests

Data structures for communication with network scorer apps.

2014-04-16 11:28:51 -07:00