tree d3dd7ef908ce61cf4ef495b28122c745dbb24f03
parent 061fe46c092f4a996b260b03a5c1511e7e603cef
parent 7b66aaebefb64e75597b33dbfac90072a8e32e9b
author Elliott Hughes <enh@google.com> 1428640376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428640376 +0000

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

* commit '7b66aaebefb64e75597b33dbfac90072a8e32e9b':
  Move default implementations into Device.