commit | 20307881d70756b73761811b00f3e033e5a2630a | [log] [tgz] |
---|---|---|
author | Selim Cinek <cinek@google.com> | Thu Oct 13 01:01:10 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 01:01:10 2016 +0000 |
tree | e3fffb45d771216526aa4d0d7fb7a7390a4273d8 | |
parent | cb654a5fbd0e5cdc6b4fa7ce7e0dfca26ac40953 [diff] | |
parent | 6f3a05ae772872f24609d2db484acb83fed312f2 [diff] |
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae77 -s ours Change-Id: I6c171749daead32d9a5e88aefa0a2a50cd767253