tree 50b287e0c89911778e5d84640694e4876923ba5e
parent f63dc857abce76ea99da200e688413afb7647d78
parent 89cebe87051a4a378d2e22acc488c9f7a7868000
author Andreas Gampe <agampe@google.com> 1535390003 -0700
committer android-build-merger <android-build-merger@google.com> 1535390003 -0700

[automerger skipped] Merge "PackageManager: Add "-a" to list packages" am: a3a0c28d15 am: e7a5d3c143
am: 89cebe8705  -s ours

Change-Id: I64dbd9c472321c33f8e14d864f480a97df05236b