tree 05e20ec1e263c5e22c8b4615e4088051aa4f50ee
parent ba99e9c72ceb916a22e4c33727ae882e1a83ae6c
parent a21587481f409b10068f4c116e1147dbd3277d8e
author Rebecca Silberstein <silberst@google.com> 1494622235 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494622244 +0000

Merge "SystemUI: add NETWORK_SETTINGS permission" into oc-dev