tree 04e86b4b112ffcd9def13a44cf19df9e5af40ad6
parent 30635df7cbb33d3e1e6b966193e2665ced206989
parent 35c77908f0bbb62480c583cf9953751424141663
author Steve McKay <smckay@google.com> 1467330676 +0000
committer android-build-merger <android-build-merger@google.com> 1467330676 +0000

Merge \"Merge \\"Allow quick view package to be set via setprop.\\" into nyc-mr1-dev am: 24cea93b4a\" into nyc-mr1-dev-plus-aosp
am: 35c77908f0

Change-Id: Ib4b46c435e38caf362f91c9674766621146ac770