tree 5f7b12449631840070d10010777c2d1d9ba14d9b
parent 729166fb448b8c2a650439931c69f27da3238d8b
parent 2633e24ed8be28b7cdd9061aabd94ab9317f92ee
author Chris Wren <cwren@android.com> 1456251912 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456251914 +0000

Merge "hide the nanos even harder" into nyc-dev