Dianne Hackborn 7557ec128f am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev ...

* commit '6bdbae07cf9b3929dca471072bea7001f7996efb':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...

2014-12-10 17:29:35 +00:00

..

java

am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev

2014-12-10 17:29:35 +00:00

jni

Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev

2014-12-10 01:33:09 +00:00

res

Import translations. DO NOT MERGE

2014-12-10 09:03:48 -08:00

tests

Sanitize display names, keep extensions intact.

2014-12-01 09:38:49 -08:00