tree cb00c95e97deaa0eab63ffd25d3c908e099f8b86
parent 382d6ecc4b408c0bfb2177ce931bfb895f64bd9a
parent 80ac3f0a4b9d007afcf51883aa8781a1ba2dd0d2
author Yoshinori Hirano <yoshinori.hirano@sonymobile.com> 1477335017 +0000
committer android-build-merger <android-build-merger@google.com> 1477335017 +0000

Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa am: 4244d53c3e am: 0be36ac0d1
am: 80ac3f0a4b

Change-Id: I5bc6a440d7a906caed9cdfe63464f692e7f0ecef