Michael Kolb 2ece6e434a am 7fbde1e8: resolved conflict for merge of 2c73e08d to master ...

* commit '7fbde1e83703f800c98c1ef7c543f3146cfa43ef':
  Add outset to decor view measuring

2014-04-01 21:13:31 +00:00

..

java

am 6f127c9b: Merge "Initial implementation of USB Audio output."

2014-04-01 16:17:13 +00:00

jni

Merge "Don't ignore return value of setAuxEffectSendLevel()"

2014-04-01 17:49:39 +00:00

res

resolved conflict for merge of 2c73e08d to master

2014-04-01 14:06:11 -07:00

tests

Expand install observer semantics

2014-03-27 12:37:47 -07:00