tree 14deafcc291f0e67498b78a2fd71b496ab85e270
parent 3f7b0c1d85659b5e6e572f14eda920738695c889
parent 24cea93b4ad60c14c9da039a2e95bd2c3e33601c
author Steve McKay <smckay@google.com> 1467330263 +0000
committer android-build-merger <android-build-merger@google.com> 1467330263 +0000

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

Change-Id: I6b95a25e1b038d8b3ffcbce1019688be3a3980db