[automerger skipped] Merge "Remove LOCAL_SRC_FILES from RRO modules" am: 5cacaef45b -s ours
am:b5b95de2cf-s ours am skip reason: change_id I2555c97f4ae98f6949837a19b4db4877cb38b607 with SHA1d4ebd771a8is in history Change-Id: I818c8c2133999f51165e1319914d6d84e580af43
This commit is contained in: