[automerger skipped] Merge "RRO for framework-res.apk is not force built...
[automerger skipped] Merge "RRO for framework-res.apk is not force built against SystemSDK" am: 73b009e9
am: d60f6cbe -s ours
Change-Id: Ic39c59e106dd81cd6903d4cd2acf5c86b252fc4a