OSDN Git Service

[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEn...
authoreddy-sh.chen <eddy-sh.chen@mstarsemi.com>
Wed, 18 Jul 2018 16:19:01 +0000 (09:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jul 2018 16:19:01 +0000 (09:19 -0700)
am: 369f587942  -s ours

Change-Id: Ie55857ab5d91d5ffd6d488a45f9859ec9cfbbe9f


Trivial merge