| commit | d491cf882b2ef7092207fb837d9703986fbc074b | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:36:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:56 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 0ed895bcf6990e34d4898856e9339d1f77b0af54 [diff] | |
| parent | dd2b0f4641531e98354466aea30fd8f2f9979f9b [diff] |
am dd2b0f46: am b698a909: (-s ours) am 45897ae1: am 7484889e: Merge "Add new density constant - 360dpi" into studio-1.3-dev automerge: 9782932 automerge: 6196f83 automerge: 13dfe29 * commit 'dd2b0f4641531e98354466aea30fd8f2f9979f9b':