Vladimir Marko 4e9176e6d5 am d9e8b73f: am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." ...

* commit 'd9e8b73fd03b2c1eda7c0cb195b39c6290de61ad':
  Fix android_media_AudioSystem_getMasterMute return type.

2014-10-29 22:07:32 +00:00

..

java

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

2014-10-29 19:42:13 +00:00

jni

am d9e8b73f: am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

2014-10-29 22:07:32 +00:00

res

Import translations. DO NOT MERGE

2014-10-29 08:20:19 -07:00

tests

Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4

2014-10-28 08:54:03 +00:00