am bee718b7: (-s ours) am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit 'bee718b7b1a9d675f3f652c2691f42a74ae0d559':
This commit is contained in: