| commit | 93344df2324aa291b41cb5c5baa81c1d71de6b40 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 17:03:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 17:03:38 2015 +0000 |
| tree | ff5929ffbdcd192189650b6a0d9999d7eac6b967 | |
| parent | 7b4c7074932d2f864c35ab6d46d05342e80f6d4b [diff] | |
| parent | 95dcb6e7bb19d5a81ce2e1a23560ae5c52f38e52 [diff] |
am 95dcb6e7: am 7beb0878: am a9853b0a: am 34f2fab8: am 9b5c55e2: am 76c8e3d5: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 * commit '95dcb6e7bb19d5a81ce2e1a23560ae5c52f38e52':