tree 384d683e9ea85cd6f49779b5563048a97f0991bf
parent 21f98459b7740f57f6fd0415298cb5f5c0c7e0ae
parent 7dac366a7f72e3d3f0c7e26616ec0ee55efe1fcd
author Hall Liu <hallliu@google.com> 1464715775 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464715777 +0000

Merge "Disable app pinning when emergency call button pressed" into nyc-dev