tree e63a64577dc24d87bebfb16541e6baeaf27c56c5
parent f3c45363bf45a1ae5af3d9e02b8a11934cd6c6d9
parent 2bf28320474702c979a06b34ca2c83daacc30c93
author Charles He <qiurui@google.com> 1507901886 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507901886 +0000

Merge "AM: introduce ActivityOptions.setLockTaskMode()."