Alan Viverette 7ac0f32c16 Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87 ...

Change-Id: Ib55f65f9b00ea6c6515d3e4fc59d86351398b7e1

2016-05-25 13:16:08 -04:00

..

java

Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87

2016-05-25 13:16:08 -04:00

jni

Merge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5 am: ca3f49d594" into nyc-dev-plus-aosp am: a90bd3a04a

2016-05-24 19:30:09 +00:00

res

Merge "Add support for android.R.attr#onTopLauncher"

2016-05-25 16:12:43 +00:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45

2016-05-24 21:47:36 +00:00