Andrew Solovay ff9216a7c9 Merge "docs: Typo fixes" into oc-mr1-dev am: ab9449561e ...

am: 54e351b3cb

Change-Id: I522c023e03a9e49cb5d02b3d84d486dec16a8fba

2017-10-28 02:19:18 +00:00

..

java

Merge "docs: Typo fixes" into oc-mr1-dev am: ab9449561e

2017-10-28 02:19:18 +00:00

jni

Merge "Switch to a fancy new queue"

2017-10-27 22:21:48 +00:00

proto/android

incidentd: Moving fingerprint.proto to server directory.

2017-10-26 11:34:50 -07:00

res

Merge "Unhide slice view APIs"

2017-10-27 22:28:47 +00:00

tests

Merge "Fixed several core and CTS tests"

2017-10-27 21:33:52 +00:00