| commit | 3f6ef78616b72753bb85c0992582c2250021b01f | [log] [tgz] |
|---|---|---|
| author | Joe Baker-Malone <jbakermalone@google.com> | Thu Aug 27 21:35:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:02 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | cab314015a34d8e0caeccff1db3e4511c814398d [diff] | |
| parent | 1a2b734c9a2e113610ed68ca70bea5ac143df821 [diff] |
am 1a2b734c: am a51ba31b: (-s ours) am 3cfce7ad: am 0f87bdc0: Merge "Fixing HtmlBuilderTest" into studio-1.4-dev automerge: 98331f5 automerge: 87e2a2f * commit '1a2b734c9a2e113610ed68ca70bea5ac143df821':