tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 0be31e577bba88ca41e85cc58468571d8ba32653
parent 9b27c773457a0485335d25c80c070a996264f1c5
author Alexandra Gherghina <alexgherghina@google.com> 1426893149 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893149 +0000

am 9b27c773: am f1d6e989: am 0b5f3bc6: Merge "Remove cross-profile package intents for Settings" into lmp-dev

* commit '9b27c773457a0485335d25c80c070a996264f1c5':