| commit | 4880314c8c336e7e9effb79fa6a1e1950a8e0fa6 | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Thu Aug 27 12:20:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:20:39 2015 +0000 |
| tree | c156bcad5f338d5aea18009464e7a7dd7c187679 | |
| parent | e47e6682f242bd9cddbcf0301f1b2efbefd043e2 [diff] | |
| parent | eea5d8878d67298a81aaf0d85dd5c9f2f9742b83 [diff] |
am eea5d887: (-s ours) am c9183441: Merge "Remove unused systemTime() and include utils/Timers.h." * commit 'eea5d8878d67298a81aaf0d85dd5c9f2f9742b83':