tree 9e420a675440c3c74ad4908afb3b06ace1716326
parent f74d6810c3adca545db8bae6fe571792da46d2fc
parent d8cc90c30337e2fd7ca07ae73abe40bc55269c5f
author Android Build Merger (Role) <android-build-merger@google.com> 1493403351 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493403356 +0000

Merge "Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636 am: 21abf1cd20"