tree d0cbc32e633fff39f61920c9199d41e487f7c238
parent 63e0f2f98db77de4cc5eaf8874d380d7eb5096ca
parent d04c51ea372ab9011999053cdab532b09284e531
author Tyler Gunn <tgunn@google.com> 1486158045 -0800
committer Tyler Gunn <tgunn@google.com> 1486158077 -0800

resolve merge conflicts of d04c51ea372a to nyc-mr2-dev-plus-aosp

Test: Fix build.
Change-Id: I5808fc02502ced2195728ad146ef5523a8eb19ae