commit | 1ae833fb9a8a3f8ee3207ebd73b8b6e12639c375 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 03:45:34 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 03:45:34 2015 +0000 |
tree | 158e4360764f3b0062a6a200409183cd5408e170 | |
parent | 67a981637a6452737623e87cab181045bafbd0be [diff] | |
parent | fde9054e6869f47bd138b6a7b335d914cd295dc6 [diff] |
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 'fde9054e6869f47bd138b6a7b335d914cd295dc6':