tree d53599e0cf68af2b7b496b7346144582c2bd8af0
parent 24801a34389e3f6f1567e1f6985fbc6b3fbf6baa
parent c6e12b5f433a9fed0cc3985cfda81847786044b5
author Luke Song <songwalker@google.com> 1507072912 +0000
committer android-build-merger <android-build-merger@google.com> 1507072912 +0000

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

Change-Id: Ife75bb7a33a1ebd7f32369fcd8b349876c8e2532