tree 61e892530ebd97421d156f4d6bccb325d0c3cac2
parent de23ec9bc161db0fa6dd0070d4e33cfe62d9aafe
parent dbc46f5e05d035524eff7fb1ea3ac8681b6b673a
author Winson Chung <winsonc@google.com> 1400269439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400269439 +0000

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

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