Merge "Use correct UID checks and proper database lookup" into nyc-mr1-dev

am: d9bc0f474c

Change-Id: I5676ed77409da3393762ab642841078caebef0fc
This commit is contained in:
Svetoslav Ganov
2016-08-24 22:00:26 +00:00
committed by android-build-merger

Diff Content Not Available