OSDN Git Service

am b34d8960: am a43f3854: Merge "slideshow: Switch to android::uptimeMillis"
authorSami Tolvanen <samitolvanen@google.com>
Tue, 13 Oct 2015 14:03:47 +0000 (14:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2015 14:03:47 +0000 (14:03 +0000)
* commit 'b34d8960465ed5c7d8d451adf025176be6090d41':
  slideshow: Switch to android::uptimeMillis


Trivial merge