tree d1028191d65bd100fc3f8245608eb4ebde991ed4
parent 6077e7213c0767f562ee5579b361e467283a4aee
parent ad61fab999ebd8ca20a1b4daae13130c0c48a819
author Android Build Merger (Role) <android-build-merger@google.com> 1500928895 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500928895 +0000

Merge "Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev am: aa5937a366 am: 1b9ec9a90f" into oc-mr1-dev-plus-aosp