Commits
Geremy Condra authored and Android Git Automerger committed 689db25e330M
am baa58cdb: am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev * commit 'baa58cdb9f7a230c224ffd3f3c519fa148d391e6': Add logic to handle changes to file_contexts during update.
Showing diff tocaff13106d7