tree 779f302b3d975f800dd1306045e8b0be31484a0c
parent f1db76e326c826f093466e44fb9343f2e0b54f14
parent 21983b0293d4dde8495c497a0191c21244a27ebf
author Adam Lesinski <adamlesinski@google.com> 1496957703 +0000
committer android-build-merger <android-build-merger@google.com> 1496957703 +0000

Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100 am: adca091fcd
am: 21983b0293

Change-Id: I3403721ca4aabb53bb2eed3b8e6dfc3093fb3b5c