Merge "Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev am: b986ebce75" into oc-mr1-dev-plus-aosp
am: e157d7fcd2 -s ours
Change-Id: Ifbd9553ef5c0bddc761a92e141896937aa7dc3b0
This commit is contained in:
am: e157d7fcd2 -s ours
Change-Id: Ifbd9553ef5c0bddc761a92e141896937aa7dc3b0