Bryce Lee a7e8717eb4 am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. ...

automerge: 2820911

* commit '28209111cc74e05fb6caa3d5b1756e57639247a4':
  Expose userActivityTimeout through @SystemApi getter/setter.

2015-02-06 20:20:47 +00:00

..

java

am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter.

2015-02-06 20:20:47 +00:00

jni

Add additional info to AudioPort for enum/selection API.

2015-02-04 14:37:19 -08:00

res

Merge "Fix breakages in update-api."

2015-02-06 13:31:02 +00:00

tests

Merge "Adapt to change of LOCAL_USE_JACK values"

2015-02-05 11:01:36 +00:00