OSDN Git Service

Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am...
authorSelim Cinek <cinek@google.com>
Thu, 13 Oct 2016 14:29:21 +0000 (14:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 14:29:21 +0000 (14:29 +0000)
commite58f1e5965cfae5df4917f33e104912622641e40
tree7c7ee3dd0d496d3bc8c6998b13b339929cc34936
parent8bd7df4536c91320d19a2508d184cb74c50f4f05
parent20307881d70756b73761811b00f3e033e5a2630a
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae77  -s ours
am: 20307881d7  -s ours

Change-Id: I14e0635d7ed1d7caf14f9217d5d0bf88685a738f