tree 0a7d68fd3720fd674ffe4df7b825e60a9f71a04f
parent 9315c9a8cdd0832d77f23d953da12c25860172e9
parent ea1212a38a85c7d207a4d092af0a33b5e353f0ad
author Android Build Merger (Role) <android-build-merger@google.com> 1506700186 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1506700186 +0000

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

Change-Id: Iaf6a29db70901d76125e79c86ca7dda0bf34ea67