tree e75abd773a39e8b23332ac08724352bb410d3a47
parent b456104d9f8ff0dba77f80f7e5e23753d58716a2
parent bdbd4736351231aac4da720ff7326ea2791e0b00
author Casey Burkhardt <caseyburkhardt@google.com> 1424308011 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424308011 +0000

am bdbd4736: Merge "Refinements to magnification for improved wearable support." into lmp-mr1-modular-dev

* commit 'bdbd4736351231aac4da720ff7326ea2791e0b00':
  Refinements to magnification for improved wearable support.