| commit | cc115c59312d5e4a9b4c63a80ecd0044b40b98d4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 08 21:25:38 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 08 21:25:43 2016 +0000 |
| tree | fd49b2cbaaefbd0d0a7a2334571fd0e183f4975e | |
| parent | 34849c22e78274fe25b96b3e7bd8bd7c65a9487d [diff] | |
| parent | ee2903686f9566a0563bdb7a263ab58454c2634a [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev