OSDN Git Service

am 584d6121: (-s ours) am a42e6816: Merge "Change NTP polling interval from 10 days...
authorChristine Hallstrom <hallstrom@google.com>
Thu, 27 Aug 2015 09:25:55 +0000 (09:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:25:55 +0000 (09:25 +0000)
* commit '584d61211f428575f4746c3ee2f66a6f8a5807af':


Trivial merge