commit | fe1d7433ea6f7c1fc28f6d9422113f32aa4f4c1e | [log] [tgz] |
---|---|---|
author | Mathew Inwood <mathewi@google.com> | Thu Dec 20 00:22:39 2018 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 20 00:22:39 2018 -0800 |
tree | 28569cc350ac71621c3799f7f5a9822bc395a5b4 | |
parent | 7223c751b6bd0fd04fe98cec3773e82c0e33eb21 [diff] | |
parent | 41e0ce14be47003b66006411f13de8132daaa48e [diff] |
[automerger skipped] Merge "Include annotation property values in output." am: 989e767e84 am: d12d0a1939 am: 41e0ce14be -s ours Change-Id: Ie9d9d329c6008b16f88aaacaf84d4a2f64663a27