tree 98ac79f186a25a67d7af92ae932616b98cc48ce1
parent 6b0aa870b821b5531f6eec782542a2b1e0f2c0ee
parent ea1212a38a85c7d207a4d092af0a33b5e353f0ad
author Adam Cohen <adamcohen@google.com> 1506717488 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1506717488 +0000

Merge changes from topic "demoModeTopic" into ub-launcher3-dorval-polish2

* changes:
  [automerger] Demo mode default layout support am: 2782449da6
  Demo mode default layout support