| commit | e7cf917ff1db3dcb1ccd5df0f7edfb2c1b09885c | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:34:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:34:31 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | b203e57db145bc7c416c7b2db0c7c8ac1c0a4a11 [diff] | |
| parent | a83a9a0b864c0803624375937c3a2b6e5758779e [diff] |
am a83a9a0b: am 2179e742: (-s ours) am 284678c2: am 640e7b08: Merge "Fix MergingReportTest." into studio-1.4-dev automerge: dc1e2d5 automerge: 7ae0bc4 * commit 'a83a9a0b864c0803624375937c3a2b6e5758779e':