| commit | d074eeb5d261236ccb09993bc6519dea17928564 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Oct 14 19:39:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 19:39:58 2016 +0000 |
| tree | faf70b7e6ceb82f5447f793c43217c8f0cff6b05 | |
| parent | 4608fb3041445cdf90dbb996391d56d45b5f9c3b [diff] | |
| parent | b05ceb233efd2192f5b124fc36769ccf4f7cab28 [diff] |
Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours am: 00c553e1ba -s ours am: 8f681f7220 am: b05ceb233e -s ours Change-Id: If0087103642b7ff1907665711c4a5821ac8beff4