tree 86a36e71625694dbac6dbc312e5674c0d214296a
parent fa3a2acfbcc45012a45cef78a9e02b8a3ee26e33
parent 1dfd9c8167d15a6e84a5ef3a0f46408eec75ddd0
author goneil <goneil@google.com> 1523497527 -0700
committer android-build-merger <android-build-merger@google.com> 1523497527 -0700

Merge "Differentiate Sim App Dialog layout for AOSP" into pi-dev
am: 1dfd9c8167

Change-Id: Ica533e245881f6132bcdc1bd09689cc44eb5b329