| commit | a29c7c77b10422e130e824fcee563fc03a6d733a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 21:14:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 21:14:56 2016 +0000 |
| tree | 09de8ee4157a68f8c9a871824199a38604bd370c | |
| parent | a009932a572d97e2bcc95e508d7b17953e8f8921 [diff] | |
| parent | d478287ab9c39ed154b01e5ee44f796d571532c5 [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa am: d478287ab9 Change-Id: Ie236947ac81a8415e0c382daf4a6527337d3e78b