tree 219d45eedfe6a29516de951e18c6c96d72a74fa7
parent 10df052c6a6cf74ef08ed5f28a45aade07b9796d
parent 69ad42a3cf12bf39fe2c47c4298f23567b3306ef
author Greg Hackmann <ghackmann@google.com> 1387311180 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387311180 +0000

am 69ad42a3: am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"

* commit '69ad42a3cf12bf39fe2c47c4298f23567b3306ef':
  Add /dev/rtc backend to SystemClock