tree d53599e0cf68af2b7b496b7346144582c2bd8af0
parent 8b8c7eb442f45eae461f35ecd04493bf25208e26
parent 16817312a6b1985d3f0afb6912051724e2695d8f
author Luke Song <songwalker@google.com> 1507072636 +0000
committer android-build-merger <android-build-merger@google.com> 1507072636 +0000

Merge "screen_ui: stage marker positioning"
am: 16817312a6

Change-Id: I4260be142441ea9473ecd121f7fd6b3090bb331c