tree de93ad2065ec7e05c042d5efae39d843c62305fb
parent fad285e191e7934906b954847d4df85f69609c94
parent 334e5dff4751eb77ade396f4c32404ca2b2892b3
author Wei Jia <wjia@google.com> 1525375696 -0700
committer android-build-merger <android-build-merger@google.com> 1525375696 -0700

Merge "fix position go backward after resume"
am: 334e5dff47

Change-Id: I500ca24ad48c9b7d54de3ec79ba98ee202bad436