tree 2df43a35cad4fa22b9e4d7d56ee93d83ef51c696
parent 0edbb19c71f7236b9e3b988d4d0a6440a2954fba
parent 165ff84d8e41ffe21951af0d8d1282e2a8ea098a
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-master

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