commit | a91407f65bce8857953f4adfa34df33aefcf3ca8 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Dec 08 16:27:07 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 16:27:07 2016 +0000 |
tree | f9d3bca5f8bb1039d87477fd33ace87fc23a8490 | |
parent | 077396733aa323930d0de86c5161024bf49cd52b [diff] | |
parent | c1afd37135b3175ae5c729cc1425cf82c564e04c [diff] |
Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev am: 1e1d5b07a6 am: c1afd37135 Change-Id: I68cdf92635f04fccc0b844c704c750088176cbff