Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf" into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
88d29a16cc