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

am: c886324aa2

Change-Id: I70b35af7ae3e82a83bb17ec7962f4a007ff8428f

2018-04-17 04:19:55 -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 "Fix instant app badge" into pi-dev am: c1dd5b0b30

2018-04-16 15:40:35 -07:00

tests

Merge "Replace phone numbers with email addresses or URLs in TextClassificationManagerTest to be less brittle."

2018-04-16 15:11:17 +00:00