tree d30d415de2c77e5ad20fa878ce14fa58b9861b11
parent bb4ae1d26a11a1211ce793278a878fa3cb224ff5
parent 9d219685c5f008ddfb0f72ef01831308d8a81c2e
author Sunny Goyal <sunnygoyal@google.com> 1414455342 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414455342 +0000

Merge "Loading internal default layout if partner layout fails to load" into ub-now-queens