tree 44130071ab578280b0304af22a581e43f930033c
parent 13e536f71019bf56393e151c52981c5c9dc0776c
parent 426eef3fc7fb6c34ac1ab63cb7120df87c59aa00
author Makoto Onuki <omakoto@google.com> 1542248407 -0800
committer android-build-merger <android-build-merger@google.com> 1542248407 -0800

[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix CTS." into nougat-cts-dev
am: 426eef3fc7  -s ours

Change-Id: If3503f5251bc66fa742828729298413e1e746a99