tree 50ed19bbcb63ec8be69730762f2b0e8c689acf60
parent 54b5f25b85e4bf4df82cb7450114fb9849f1ae58
parent 1d0df5b203abdd7e7e9994bcaf43a65e65fb1c41
author Erik Kline <ek@google.com> 1447292700 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447292700 +0000

Merge "Lower NTP timeout from 20 seconds down to 5 seconds"