tree 8fd2c5882e6d14608b82dfcb58dfd6e1f165e825
parent b195b6ef834e5319e96ee9e21f13d32bb175562a
parent 65baefcfebe412c3fa4615f8061c3bd244a1e7c7
author Android Build Merger (Role) <android-build-merger@google.com> 1461974997 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461974997 +0000

Merge "Merge "Atrace: store app list in multiple sysprops" into nyc-dev am: 9a8ddb6e71 am: afd2089ad4" into nyc-mr1-dev-plus-aosp