| commit | 7f9b3413b65576750641fc532b6deee97280f2d9 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Wed Apr 11 05:53:23 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 11 05:53:23 2018 -0700 |
| tree | 0b5c9324f938b106f3722c5b7ba267b2dd8f4bbe | |
| parent | 4f6d1c136ea9216d20ac16a5cbcce009cfa07dc7 [diff] | |
| parent | 049d16f963fbb260bb5d518a3b18cac06b8a1deb [diff] |
[automerger skipped] Merge changes from topics "oth-jli-static-initializers-aosp", "oth-jli-hiddenapi-aosp" am: b2be082311 am: 049d16f963 -s ours Change-Id: I1b3da65fea5e1f2242d2e71e69f4e2c245d27d22