commit | 46c3b1a1de6883489dc90abee60b3a805a357b0d | [log] [tgz] |
---|---|---|
author | Chris Warrington <cmw@google.com> | Thu Aug 27 12:17:41 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:17:41 2015 +0000 |
tree | 55f14758d30a9c1e7fa3015c665822bb1363e950 | |
parent | 46832a5438bd36d806136696dcb07b25fc2235fc [diff] | |
parent | bffde0a6d2a1fb2969ef85850d53be124a98d064 [diff] |
am bffde0a6: (-s ours) am 334d9faa: Merge "Proguard: Only keep parcelables if they are used." into studio-1.4-dev automerge: 833246f automerge: 014287c * commit 'bffde0a6d2a1fb2969ef85850d53be124a98d064':