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

2014-12-10 17:23:07 +00:00

..

java

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

2014-12-10 17:23:07 +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 08:40:30 -08:00

tests

Sanitize display names, keep extensions intact.

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