Vinod Krishnan 4a3735d081 resolved conflicts for merge of 88aa8aab to master ...

Change-Id: I6d3a9885f8cf3b632267b5722e59d4968efe17f7

2014-05-09 13:23:41 -07:00

..

java

resolved conflicts for merge of 88aa8aab to master

2014-05-09 13:23:41 -07:00

jni

Add hidden support for ENCODING_PCM_FLOAT to AudioTrack

2014-05-08 16:11:42 -07:00

res

resolved conflicts for merge of 88aa8aab to master

2014-05-09 13:23:41 -07:00

tests

Introduce new API for floating window support

2014-05-09 19:17:15 +09:00