Merge "Use the correct item layout for android:entries" into mnc-ub-dev
am: 5bee60e

* commit '5bee60e9f20fe639c664ef84f0e9515ca78466a5':
  Use the correct item layout for android:entries

Change-Id: Ie4957942c91156dac88afa0fcc5462551470e738