Colin Cross 7eb3f1c1c4 Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef ...

am: 162d19f590

Change-Id: Iac2f159014051604d36f61dd253fa4e83127030a

2017-05-17 15:36:06 +00:00

..

java

Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3

2017-05-16 21:09:51 +00:00

jni

Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef

2017-05-17 15:36:06 +00:00

res

Merge "Add key for carrier_volte_provisioned" am: 79d3648cc2

2017-05-11 23:21:54 +00:00

tests

Moved c.a.i.u.Predicate[s] into legacy-test

2017-05-15 15:17:48 +01:00