Julia Reynolds df4abef0de Merge "String update for effect suppressors" into pi-dev am: 17b2f5d427 ...

am: e7242f6e5e

Change-Id: I2870de34a7fc6ccea2688007d317c38ad4dd1dab

2018-04-17 11:21:33 -07:00

..

java

Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev am: 5037beea1c

2018-04-17 04:19:55 -07:00

jni

Merge "[JNI] Adapt graphics::common:V1_0::Hdr from HAL." into pi-dev am: 16da326cf5

2018-04-16 23:15:47 -07:00

proto

Merge "Enforce dump permission in stats service" into pi-dev

2018-04-17 01:34:47 +00:00

res

Merge "String update for effect suppressors" into pi-dev am: 17b2f5d427

2018-04-17 11:21:33 -07:00

tests

Merge "Correct sendBroadcast test"

2018-04-17 18:02:39 +00:00