[automerger skipped] Don't depend on R.txt)

am: 17de09f74d  -s ours

Change-Id: I038a08cef874c0f348893b028b7f0789dc182cb4
This commit is contained in:
Colin Cross 2018-04-11 00:21:55 -07:00 committed by android-build-merger
commit a876409152

Diff Content Not Available