Jason Monk df0975bba5 Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev ...

am: c2375d9b3d

Change-Id: Id7145e9d6432586d295f59b67a4f3b7e44d935b1

2018-04-11 11:56:07 -07:00

..

java

Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev

2018-04-11 11:56:07 -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 "Configurable sampling rate for hidden API access log events." into pi-dev

2018-04-11 10:19:04 -07:00