tree d003a711dfee2f194844638166a3a72767d05c05
parent 9dd0fb2999d5328c1001765268804e056dbc9210
parent 9042585fa083eca2df9b2202496542927fa1e940
author Nicolas Geoffray <ngeoffray@google.com> 1512823995 +0000
committer android-build-merger <android-build-merger@google.com> 1512823995 +0000

Merge "Revert "Rewrite scoped arrays with template and introduced nullable one.""
am: 9042585fa0

Change-Id: Ide0f0b5580ded28c962aa68b215abc9744d359fd