tree 76c220196475a2350b85fe1dd13646f320432c23
parent b4df52a9c1d7c34ed06d8f313a681153d0447bd0
parent af72e460a5b8ffcd001f8ea09fe642e7ec9ba59e
author Youming Ye <paulye@google.com> 1537309181 -0700
committer android-build-merger <android-build-merger@google.com> 1537309181 -0700

Merge "Allow config of wfcSpnFormats to use root locale" am: b9c0115518
am: af72e460a5

Change-Id: Id3cb512e9f200a90b07eb45249231ac98458fa18