| commit | f69a47fcdcfa5fe062b160cecdc743acc39c59cf | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Oct 14 14:29:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 14:29:03 2016 +0000 |
| tree | 7bff47573eb73594c75cd77f4b9047e6cf9d2166 | |
| parent | c01d969abf928e8c7f62d6b01de18f9f5f21de3a [diff] | |
| parent | e58f1e5965cfae5df4917f33e104912622641e40 [diff] |
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae77 -s ours am: 20307881d7 -s ours am: e58f1e5965 Change-Id: I483d2f52d347d2fb0064a6f9a0e6db3d5a61aa67