Elliott Hughes ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master ...

* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables

2015-09-24 17:14:10 +00:00

..

java

am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev

2015-09-23 18:05:58 +00:00

jni

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00

res

am 2bc3ff3c: am de02fe2a: am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev

2015-09-24 04:26:03 +00:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00