Makoto Onuki a59e4503a1 Merge "Update the javadoc on requestPinShortcut() about multiple..."

2017-01-11 18:13:04 +00:00

..

java

Merge "Update the javadoc on requestPinShortcut() about multiple..."

2017-01-11 18:13:04 +00:00

jni

resolve merge conflicts of 082a1721b5 to master

2017-01-11 08:30:17 -08:00

proto/android

Clean up file names for protos

2016-12-20 22:28:56 -08:00

res

Merge "Accessibility support for ClickableSpan"

2017-01-11 16:42:29 +00:00

tests

Merge "Add a required main category for multi logs."

2017-01-11 17:54:13 +00:00