Bo Zhu 4e7fbda633 Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev ...

am: 4d1b57dad3

Change-Id: I07106b9b06f290d6d464a8d5bfbf82d90e95e000

2018-04-11 09:21:14 -07:00

..

java

Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev

2018-04-11 09:21:14 -07:00

jni

Merge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev

2018-04-10 12:24:33 -07:00

proto

Merge "Prevent extraneous saving of pinned snap fraction." into pi-dev

2018-04-11 02:32:46 +00:00

res

Merge "Ensure colors for active permission icons" into pi-dev

2018-04-10 19:49:55 -07:00

tests

Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev

2018-04-10 13:51:12 -07:00