tree b6eb82cd9b6b34403fba4d864b46b58b2131e9d9
parent 206bacb18b52f70032e3b23a2e96b6cfb6e4aea4
parent 9ca4d4392243e71b44ae4b83d2719a729f6a07d8
author Nathan Harold <nharold@google.com> 1530228416 -0700
committer android-build-merger <android-build-merger@google.com> 1530228416 -0700

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

Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34