tree 1ad6cb9e08c44aef1ef9b644fe4fd561f57adfd2
parent 169ebc8deccdacfcaaa73e70c67f4354278c8676
parent 78626ad9b542494a2b030290021a9890ced38c28
author Nicolas Geoffray <ngeoffray@google.com> 1512824384 +0000
committer android-build-merger <android-build-merger@google.com> 1512824384 +0000

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

Change-Id: I49b37f940faba567af1487030e14dd7c33ac4a04