Narayan Kamath 2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" ...

* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""

2014-11-03 14:31:11 +00:00

..

java

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

2014-11-03 14:31:11 +00:00

jni

am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

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

res

Import translations. DO NOT MERGE

2014-10-30 15:17:39 -07:00

tests

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

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