tree f1177938e57b46a419982b3f71a69a3d65634702
parent 5b5e50d987b0b80ae872425d402375671952eea7
parent f6a55b6d6dc51ac0466a374676c14bef5acfc609
author Chen Xu <fionaxu@google.com> 1521790556 +0000
committer android-build-merger <android-build-merger@google.com> 1521790556 +0000

[automerger skipped]Merge "new WFC registration failure notification string" am: 8bcb7aa971 am: 88959d3ceb  -s ours
am: f6a55b6d6d  -s ours

Change-Id: I8468a8874d5dfefae94e6b08eafe4d5bcfdc1001