tree c9f700453aa51ba518153e3ea73064b80db1afda
parent 81e4f93c9a1ccebcab1154e631442c03b6a575aa
parent 92e70e7e8a0f397caeb0175d125d120072c2b7f9
author Weilun Du <wdu@google.com> 1486688587 +0000
committer android-build-merger <android-build-merger@google.com> 1486688587 +0000

Merge "Resend NITZ when the upstream client is not ready" am: 0e4644614a
am: 92e70e7e8a

Change-Id: I82259b544d32eb54cb0a7b90adc158fa6b62093e