tree 5aa0be604a4da83e17c7d95b62da3de65fe61fe6
parent d2d52d2c3e8bb06b9d98cb863686ae4ab99ac1dc
parent 8861d33dec8341d445512ff0ea032f278fe3b770
author felkachang <felkachang@google.com> 1541566612 -0800
committer android-build-merger <android-build-merger@google.com> 1541566612 -0800

Merge "Fix the wrong number of icons in shelf for RTL" into pi-dev
am: 8861d33dec

Change-Id: I42aba38e24a3a9bb5c7084a07cf68ef191d07a75