tree 092cc406b9a4ef93828443762ff50cd5520358d4
parent 48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6
parent 1942be506eb16589e3059fa62ea7b718440fb386
author Thierry Strudel <tstrudel@google.com> 1446532798 +0000
committer android-build-merger <android-build-merger@google.com> 1446532798 +0000

Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am: 1942be506e

* commit '1942be506eb16589e3059fa62ea7b718440fb386':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time