Skip to content
Commit d2768c67 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev... 

Merge "Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev am: b986ebce" into oc-mr1-dev-plus-aosp
am: e157d7fc  -s ours

Change-Id: Ifbd9553ef5c0bddc761a92e141896937aa7dc3b0
parents bac998a0 e157d7fc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment