am f2d26716: am 0d97114f: am fba233bd: am 33ad8700: am 1ae833fb: am fde9054e: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 automerge: 76c8e3d

* commit 'f2d2671635afa3b78de270eb54e7ce0793523a8e':