tree 61139a36394aa4a06deb101b075c3456e348d803
parent b6feb208663de75204b4f01935fcecd0fac00886
parent 6df24b7793b744055e4e388bc75ebb5c9f34cbe8
author Winson Chung <winsonc@google.com> 1400264834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400264834 +0000

am 6df24b77: Merge "Adding support for dynamically resolved default layouts." into ub-now-nova

* commit '6df24b7793b744055e4e388bc75ebb5c9f34cbe8':
  Adding support for dynamically resolved default layouts.