Speculatively fix Android automerger

Speculatively fix Android automerger

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2155713004

Committed: https://skia.googlesource.com/skia/+/80d46ccb2868b986c88c487c20d6b64b6762d024

[msarett, 2016-07-15 20:43:36]

Description was changed from

==========
Speculatively fix Android automerger

BUG=skia:
==========

to

==========
Speculatively fix Android automerger

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2155713004
==========

[msarett, 2016-07-15 20:43:46]

The CQ bit was checked by msarett@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-07-15 20:43:49]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[msarett, 2016-07-15 20:44:12]

The CQ bit was unchecked by msarett@google.com

[msarett, 2016-07-15 20:45:22]

The CQ bit was checked by msarett@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-07-15 20:45:32]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[msarett, 2016-07-15 20:48:09]

msarett@google.com changed reviewers:
+ djsollen@google.com, fmalita@chromium.org

[msarett, 2016-07-15 20:48:10]

Android.mk generator is complaining that we have two targets both named "expat".

[f(malita), 2016-07-15 20:49:32]

lgtm

[commit-bot: I haz the power, 2016-07-15 21:16:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-15 21:16:44]

Dry run: This issue passed the CQ dry run.

[msarett, 2016-07-15 21:17:46]

The CQ bit was checked by msarett@google.com

[commit-bot: I haz the power, 2016-07-15 21:17:55]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-15 21:18:52]

Description was changed from

==========
Speculatively fix Android automerger

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2155713004
==========

to

==========
Speculatively fix Android automerger

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2155713004

Committed:
https://skia.googlesource.com/skia/+/80d46ccb2868b986c88c487c20d6b64b6762d024
==========

[commit-bot: I haz the power, 2016-07-15 21:18:53]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/80d46ccb2868b986c88c487c20d6b64b6762d024