tree cf2d3aac0c6a9fdb0d09d8da9de3879551956150
parent bd6955bb261db9be191286f24ffc1817fa6ba06b
parent b14f749b7a3fa53e463cd4f94ecc90a1dbc3cf9e
author Nan Zhang <nanzhang@google.com> 1523481303 -0700
committer android-build-merger <android-build-merger@google.com> 1523481303 -0700

Fix broken build for git_master/apps
am: b14f749b7a

Change-Id: I8c86cb15591a9afecee34beb4b03d5de19f1c645