tree 120dfd61c640c8d7d754e05648684edb47128bf5
parent 55c82c6c2742002683d170020d79a9379905edcc
parent 79faaac0cae038316d06b1b299f33dedeb774c9c
author android-build-prod (mdb) <android-build-team-robot@google.com> 1518737126 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1518737126 +0000

Snap for 4607260 from 79faaac0cae038316d06b1b299f33dedeb774c9c to lollipop-mr1-cts-release

Change-Id: I97c887742f871488982fcf24207af15550c67ca7