| commit | e4e8baf256c1c05b6f65b6f128294372643b5219 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:37:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:00 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 794dfd96ce28d18be1c3e9dddf8034761705863b [diff] | |
| parent | a319973cc216c31b27374ff441ac8dc245c3d212 [diff] |
am a319973c: am 6e002db7: (-s ours) am 13f83d45: am cf9329fa: Merge "Add option to getDensityDpi directly." into studio-1.3-dev automerge: 2a761be automerge: c4309f2 automerge: d226521 * commit 'a319973cc216c31b27374ff441ac8dc245c3d212':