tree 923b21041210a09629d7d9d6a511b6f4061c2d5d
parent c15002162447f3e873fd7043c846ac087a925608
parent c9df31429ab0d00e40dd3d0a619ecece89fa945b
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1541801456 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1541801456 +0000

Merge "Merge "Fix adb shell cmd activity get-config --proto --device fail" am: c0dd0d6648 am: bb5384dbd0 am: f604b8b688"