commit | c1afd37135b3175ae5c729cc1425cf82c564e04c | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Dec 08 02:01:04 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 02:01:04 2016 +0000 |
tree | d7ab9966e8ddaa8afe5a27bcd6577bc56ed08651 | |
parent | 889c64a30bb3e41974d0dd2e0b629ed3ff1d8055 [diff] | |
parent | 1e1d5b07a69243187b932118b30ce1196dab990a [diff] |
Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev am: 1e1d5b07a6 Change-Id: I47b86760bab79c447cfbe23ad163e8864da05eb1