am b8902c19: am 4167593f: am ccd2993c: 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

* commit 'b8902c193e447647e0254602fa192b48b516415d':