Neil Fuller c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp ...

Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7

2014-10-02 14:32:37 +01:00

..

java

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

jni

am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev

2014-10-02 12:38:21 +00:00

res

am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev

2014-10-01 22:02:36 +00:00

tests

NetworkStats always needs arrays.

2014-09-17 09:26:31 -07:00