tree 46daa16ad61b265a71ef8c6ead1b89bb010512b0
parent aacfdb6ade1cc2109a98bd5060ef479bab4a578b
parent fe8b52fe65f79499bc5021882ea5e9e50dfc4966
author Jordan Liu <jminjie@google.com> 1531182649 -0700
committer android-build-merger <android-build-merger@google.com> 1531182649 -0700

Merge "StkMenuActivity shall handle timeout exactly even in the low-power mode"
am: fe8b52fe65

Change-Id: Icaae66c1bf40677190b381717f462c1dcd226eb0