tree d3dd7ef908ce61cf4ef495b28122c745dbb24f03
parent 0c23c97c78211bc98c3dadd7f613e764e183a0ea
parent e001074f227fb74f6ebf5b26c222d09fe69712c0
author Elliott Hughes <enh@google.com> 1428620347 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428620347 +0000

am e001074f: Merge "Move default implementations into Device."

* commit 'e001074f227fb74f6ebf5b26c222d09fe69712c0':
  Move default implementations into Device.