Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev am: 1e1d5b07a6

am: c1afd37135

Change-Id: I68cdf92635f04fccc0b844c704c750088176cbff
This commit is contained in:
Adrian Roos
2016-12-08 16:27:07 +00:00
committed by android-build-merger

Diff Content Not Available