tree db3e1ba38472dafb75566206b14ccd36079dd57a
parent 9852064d004bdf0e744a16eea7f2371654359a40
parent d67a9006b460f502295e9df066739559f1b391f8
author Nathan Harold <nharold@google.com> 1530229567 -0700
committer android-build-merger <android-build-merger@google.com> 1530229567 -0700

[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" am: 9ca4d43922  -s ours am: f0893a15ab  -s ours
am: d67a9006b4  -s ours

Change-Id: Ibd255cbdaa91e1770471aa1e84151105b33915a3