tree 1a3a9ac69e0d5e5530529e2a2c456a8586273302
parent de2448a50c96335fd4b2fd460edbd54f5798bb90
parent 69e179265f3c98c7b28daa91012a5e6bbefffde6
author Mady Mellor <madym@google.com> 1523376541 -0700
committer android-build-merger <android-build-merger@google.com> 1523376541 -0700

Fix bug with list layouts am: cac9e71afe
am: 69e179265f

Change-Id: Ia026810d71a57723a9cf12b8503e5894f008e5d8