| commit | adc8b8fe06b844337cdc5370678a594db7d4a924 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Thu Aug 27 21:33:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:33:49 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | aa4e5e7e89f3bd9ded171ec1469f761f71737508 [diff] | |
| parent | e8680e7a4720ac82ecaf5b5e75c0132da261133d [diff] |
am e8680e7a: am 77db06e7: (-s ours) am de621970: am e519306c: Merge "Show the error when there is no viewbox attribute in the root tag." into studio-1.4-dev automerge: 279d99f automerge: bccdc87 * commit 'e8680e7a4720ac82ecaf5b5e75c0132da261133d':