| commit | d2768c67235d060616860db8475b7c1571b7fd72 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Oct 03 23:55:16 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 03 23:55:16 2017 +0000 |
| tree | 929e7fb2eb4d3c8d85d24738c495900e32a59b2d | |
| parent | bac998a0cb4e8c19350129d2541bbb33cbd7d7f4 [diff] | |
| parent | e157d7fcd245021fed192f085519809f127a6007 [diff] |
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