| commit | b34d8960465ed5c7d8d451adf025176be6090d41 | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Tue Oct 13 13:54:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 13:54:36 2015 +0000 |
| tree | 4e05dbe7952fcf8c6dbc48c13c3b0f4f1aea347b | |
| parent | 2b98f46082c4727c576aa17d6012d5f5a4f75744 [diff] | |
| parent | a43f3854c60508e00b05201e91dee7571afd3a95 [diff] |
am a43f3854: Merge "slideshow: Switch to android::uptimeMillis" * commit 'a43f3854c60508e00b05201e91dee7571afd3a95': slideshow: Switch to android::uptimeMillis