tree a40c19c144b92a8941c57a62576e29826cfbcf36
parent 8e14e19ef57452f5b41c19e53ff1b603fc5e79f4
parent 301951f8a43fc6002121a6164c3ed6ed8307f0a7
author chenhg <chenhg@synaptics.com> 1519958344 +0000
committer android-build-merger <android-build-merger@google.com> 1519958344 +0000

Merge "configstore: allow to USE_CONTEXT_PRIORITY by device." am: cd712b0e8f
am: 301951f8a4

Change-Id: I92ff43ccecfc8e87e670181d45de1ffa2fa279af