tree d003a711dfee2f194844638166a3a72767d05c05
parent be35457f9150edf1c709c63782bd9dfa5da9bc17
parent a4e70243335ebc236cf94ee56a438ef711301b3b
author Nicolas Geoffray <ngeoffray@google.com> 1512824173 +0000
committer android-build-merger <android-build-merger@google.com> 1512824173 +0000

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

Change-Id: I41ba36d4b19840ea41bc24cf6ab77f964e2587e5