Narayan Kamath d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master ...

Change-Id: Ibdada14406f49684cf345162204b9810452f25a2

2014-10-29 11:23:45 +00:00

..

java

resolved conflicts for merge of 9834af9c to stage-aosp-master

2014-10-29 11:23:45 +00:00

jni

am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"

2014-10-28 19:28:42 +00:00

res

am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev

2014-10-18 19:56:23 +00:00

tests

am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"

2014-10-20 10:16:08 +00:00