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

am: 1e1d5b07a6

Change-Id: I47b86760bab79c447cfbe23ad163e8864da05eb1
This commit is contained in:
Adrian Roos
2016-12-08 02:01:04 +00:00
committed by android-build-merger

Diff Content Not Available