| commit | ae5db8a6dcc06fb65a1494d52f2956ef770006e1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Nov 11 00:01:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 11 00:01:56 2016 +0000 |
| tree | 160735c389cc8ec069b82cf08a71058ca83550d5 | |
| parent | 6ec8dd10bb902855f72975b9ec07e17dfdcebaa8 [diff] | |
| parent | ca2abc5b71ea7854fa15c11f386c236ba9cf93a0 [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 Change-Id: Ia45feea279ef24afe3450108fc63343461abf7ea