| commit | 8acddad6e795d6715c665a54f17b468355693706 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Tue Jul 03 16:57:23 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 03 16:57:23 2018 -0700 |
| tree | 39008bdcf2e784960fcdb0d63bb7ec686de1f41e | |
| parent | af09f19e1f3cfe02be2db6a4e3cca2fad1184f8d [diff] | |
| parent | d1b4a496ec5b44ca5bad268bde8ee260f0479cf6 [diff] |
[automerger skipped] Merge "Include annotations in metalava stubs" into pi-dev am: 9654ecebd7 -s ours am: d1b4a496ec -s ours Change-Id: Ie22a5c94c18f3e1a6a75a8440d2c26d50f71caea