Vladimir Marko 548101cb96 am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." ...

* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
  Fix android_media_AudioSystem_getMasterMute return type.

2014-10-29 21:57:16 +00:00

..

java

am e87d36f8: Merge "Revert "Remove unused apache related API.""

2014-10-29 11:30:11 +00:00

jni

am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

2014-10-29 21:57:16 +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