| commit | 049d16f963fbb260bb5d518a3b18cac06b8a1deb | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Wed Apr 11 05:46:58 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 11 05:46:58 2018 -0700 |
| tree | 1bd0cf8026f3f98c04f9a8445ee034762a1dbe23 | |
| parent | e2db2a335e10150ab583f30cca271acee4c4003f [diff] | |
| parent | b2be0823115cfdd7907207e3dac9fcb669941811 [diff] |
Merge changes from topics "oth-jli-static-initializers-aosp", "oth-jli-hiddenapi-aosp" am: b2be082311 Change-Id: Iff0cb8bf59c9ef1a65fb9c75dfa399d8e2651e7e