tree 30cef9931126b62e2e5a43840a61a000b1b848cf
parent 9805a309e38b89fbf3dd3fa80219a9c94ed41891
parent d60f6cbea77629fab17310381d651e48204af251
author Jiyong Park <jiyong@google.com> 1522122363 +0000
committer android-build-merger <android-build-merger@google.com> 1522122363 +0000

[automerger skipped] Merge "RRO for framework-res.apk is not force built against SystemSDK" am: 73b009e96c
am: d60f6cbea7  -s ours

Change-Id: Ic39c59e106dd81cd6903d4cd2acf5c86b252fc4a