tree da84982155d8e87dd9bc316b3ff49403bb2c0d30
parent 5273c0f1e2d633c192074cdffe6c9b8a596d575c
parent b008a665a50724c7ff2d9860282e9ccc14563901
author Hyunyoung Song <hyunyoungs@google.com> 1534941811 -0700
committer android-build-merger <android-build-merger@google.com> 1534941811 -0700

[automerger skipped] Merge changes from topic "from-pi-gsi" am: 8e639205d7  -s ours
am: b008a665a5  -s ours

Change-Id: Ibfc765d196d78e95d2258ab8d2ab30c0a222dbcc