Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

R=twellington@chromium.org
TBR=boliu@chromium.org, caitkp@chromium.org, dtrainor@chromium.org, grt@chromium.org, joedow@chromium.org, yfriedman@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/e5a4384de1d67657590646b306c6e66746f1174b

[Ian Wen, 2016-08-26 19:03:51]

ianwen@chromium.org changed reviewers:
+ twellington@chromium.org

[Ian Wen, 2016-08-26 19:03:52]

PTAL

[Theresa, 2016-08-26 20:54:22]

lgtm

[Ian Wen, 2016-08-26 21:02:30]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
TBR=sky@chromium.org, yfriedman@chromium.org, dtrainor@chromium.org,
kelvinp@chromium.org, boliu@chromium.org
==========

[Ian Wen, 2016-08-26 21:05:33]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
TBR=sky@chromium.org, yfriedman@chromium.org, dtrainor@chromium.org,
kelvinp@chromium.org, boliu@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=sky@chromium.org, yfriedman@chromium.org, dtrainor@chromium.org,
kelvinp@chromium.org, boliu@chromium.org, grt@chromium.org
==========

[Ian Wen, 2016-08-26 21:06:20]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=sky@chromium.org, yfriedman@chromium.org, dtrainor@chromium.org,
kelvinp@chromium.org, boliu@chromium.org, grt@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, kelvinp@chromium.org,
boliu@chromium.org, grt@chromium.org
==========

[Ian Wen, 2016-08-26 21:06:46]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, kelvinp@chromium.org,
boliu@chromium.org, grt@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org
==========

[Ian Wen, 2016-08-26 21:08:20]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

[Ian Wen, 2016-08-26 21:11:48]

TBR the same people who have reviewed the original CL.

[Ian Wen, 2016-08-26 21:11:56]

The CQ bit was checked by ianwen@chromium.org

[commit-bot: I haz the power, 2016-08-26 21:13:09]

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-08-26 21:45:07]

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

[commit-bot: I haz the power, 2016-08-26 21:45:08]

Try jobs failed on following builders:
  android_arm64_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm6...)

[Ian Wen, 2016-08-29 20:35:56]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641416
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

[Theresa, 2016-08-29 20:44:23]

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
(right):

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:77:
@TargetApi(24)
This needs to get updated to JellyBean_MR1

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:79:
super.attachBaseContext(newBase);
Let's add a check here to return early if the SDK is < JellyBean MR1

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:99:
if ("HK".equals(Locale.getDefault().getCountry())) {
Do we want to add Macau as well?

[Ian Wen, 2016-08-29 21:03:47]

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
(right):

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:77:
@TargetApi(24)
On 2016/08/29 20:44:23, Theresa Wellington wrote:
> This needs to get updated to JellyBean_MR1

Done.

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:79:
super.attachBaseContext(newBase);
On 2016/08/29 20:44:23, Theresa Wellington wrote:
> Let's add a check here to return early if the SDK is < JellyBean MR1

Done.

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:99:
if ("HK".equals(Locale.getDefault().getCountry())) {
On 2016/08/29 20:44:23, Theresa Wellington wrote:
> Do we want to add Macau as well?

Probably not. Macau is only an option after Android N, and if Macau is set the
framework should handle the fallback.

[Ian Wen, 2016-08-29 21:03:56]

The CQ bit was checked by ianwen@chromium.org to run a CQ dry run

[Ian Wen, 2016-08-29 21:05:27]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

Impact of this revert: Honkong Chrome on Android users might see English
Chrome again. :(

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

This CL tries to let HK users have translation, by override the app's locale in
configuration in attachBaseContext().

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

[jungshik at Google, 2016-08-29 21:19:42]

jshin@chromium.org changed reviewers:
+ jshin@chromium.org

[jungshik at Google, 2016-08-29 21:19:42]

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
(right):

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:96:
// Before Android N, zh_HK is not well supported. Here we fall back manually to
TW locale.
The above is not an accurate statement. 

zh-HK (as a locale) was supported by Android OS. When an app (e.g. Chrome) does
not support zh-HK, the OS tries zh and en in turn. Because Chrome does not have
zh, zh-HK ends up falling back to English. So, we need to manually override
that.

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:99:
if ("HK".equals(Locale.getDefault().getCountry())) {
On 2016/08/29 21:03:47, Ian Wen wrote:
> On 2016/08/29 20:44:23, Theresa Wellington wrote:
> > Do we want to add Macau as well?
> 
> Probably not. Macau is only an option after Android N, and if Macau is set the
> framework should handle the fallback.

Android OEMs can add zh-MO, zh-SG and whatever locale they want to add. So,
Macau 
does have to be added here. 

For zh-SG, it has to be mapped to zh-CN manually on M or earlier. 

Moreover, just checking the country is risky. Language should be also checked
and mapping should be done only when both lang and region match. 
i.e. zh-HK, zh-MO => zh-TW.   zh-SG to zh-CN.

[Ian Wen, 2016-08-29 21:34:03]

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
(right):

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:96:
// Before Android N, zh_HK is not well supported. Here we fall back manually to
TW locale.
On 2016/08/29 21:19:42, jungshik at google wrote:
> The above is not an accurate statement. 
> 
> zh-HK (as a locale) was supported by Android OS. When an app (e.g. Chrome)
does
> not support zh-HK, the OS tries zh and en in turn. Because Chrome does not
have
> zh, zh-HK ends up falling back to English. So, we need to manually override
> that. 

Indeed. Done.

https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:99:
if ("HK".equals(Locale.getDefault().getCountry())) {
On 2016/08/29 21:19:42, jungshik at google wrote:
> On 2016/08/29 21:03:47, Ian Wen wrote:
> > On 2016/08/29 20:44:23, Theresa Wellington wrote:
> > > Do we want to add Macau as well?
> > 
> > Probably not. Macau is only an option after Android N, and if Macau is set
the
> > framework should handle the fallback.
> 
> Android OEMs can add zh-MO, zh-SG and whatever locale they want to add. So,
> Macau 
> does have to be added here. 
> 
> For zh-SG, it has to be mapped to zh-CN manually on M or earlier. 
> 
> Moreover, just checking the country is risky. Language should be also checked
> and mapping should be done only when both lang and region match. 
> i.e. zh-HK, zh-MO => zh-TW.   zh-SG to zh-CN. 

What you said is correct in theory, but I failed to find devices that ship with
a Macau locale.

Since this CL will be merged to M53, I only want to fix the regression and the
cases we could test. zh_MO and zh_SG were never supported in Chrome. I can add
these two on M55 trunk.

[jungshik at Google, 2016-08-29 21:37:27]

Could you also update the CL summary and description? This CL does more than
reverting the previous CL, doesn't it? 

It adds a manual fallback override for Android M or earlier. 
Just reading the CL summary/description, one wouldn't know that. 

Thanks

[jungshik at Google, 2016-08-29 21:41:51]

On 2016/08/29 21:34:03, Ian Wen wrote:
>
https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
> File
>
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
> (right):
> 
>
https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
>
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:96:
> // Before Android N, zh_HK is not well supported. Here we fall back manually
to
> TW locale.
> On 2016/08/29 21:19:42, jungshik at google wrote:
> > The above is not an accurate statement. 
> > 
> > zh-HK (as a locale) was supported by Android OS. When an app (e.g. Chrome)
> does
> > not support zh-HK, the OS tries zh and en in turn. Because Chrome does not
> have
> > zh, zh-HK ends up falling back to English. So, we need to manually override
> > that. 
> 
> Indeed. Done.
> 
>
https://codereview.chromium.org/2280143002/diff/20001/chrome/android/java/src...
>
chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java:99:
> if ("HK".equals(Locale.getDefault().getCountry())) {
> On 2016/08/29 21:19:42, jungshik at google wrote:
> > On 2016/08/29 21:03:47, Ian Wen wrote:
> > > On 2016/08/29 20:44:23, Theresa Wellington wrote:
> > > > Do we want to add Macau as well?
> > > 
> > > Probably not. Macau is only an option after Android N, and if Macau is set
> the
> > > framework should handle the fallback.
> > 
> > Android OEMs can add zh-MO, zh-SG and whatever locale they want to add. So,
> > Macau 
> > does have to be added here. 
> > 
> > For zh-SG, it has to be mapped to zh-CN manually on M or earlier. 
> > 
> > Moreover, just checking the country is risky. Language should be also
checked
> > and mapping should be done only when both lang and region match. 
> > i.e. zh-HK, zh-MO => zh-TW.   zh-SG to zh-CN. 
> 
> What you said is correct in theory, but I failed to find devices that ship
with
> a Macau locale.
> 
> Since this CL will be merged to M53, I only want to fix the regression and the
> cases we could test. zh_MO and zh_SG were never supported in Chrome. I can add
> these two on M55 trunk.

Thanks.  That's fine, too. 

Chrome never has had separate resource bundles for zh-MO/zh-SG. The same is true
of zh-HK. However, that does not
mean that Chrome does not "support" them. Chrome desktop/Chrome OS has mapped
zh-{HK,MO} to zh-TW and zh-SG to zh-CN almost from the beginning (2008). :-).

[Ian Wen, 2016-08-29 21:49:42]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

This CL tries to let HK users have translation, by override the app's locale in
configuration in attachBaseContext().

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

[Ian Wen, 2016-08-29 21:50:29]

The CQ bit was checked by ianwen@chromium.org

[Ian Wen, 2016-08-29 21:50:29]

The patchset sent to the CQ was uploaded after l-g-t-m from
twellington@chromium.org
Link to the patchset: https://codereview.chromium.org/2280143002/#ps80001
(title: "Revert change in AsyncInitializationActivity")

[commit-bot: I haz the power, 2016-08-29 21:51:07]

Dry run: 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-08-30 02:45:20]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

TBR=yfriedman@chromium.org, dtrainor@chromium.org, joedow@chromium.org,
boliu@chromium.org, grt@chromium.org, caitkp@chromium.org
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

R=twellington@chromium.org
TBR=boliu@chromium.org, caitkp@chromium.org, dtrainor@chromium.org,
grt@chromium.org, joedow@chromium.org, yfriedman@chromium.org

Committed: https://crrev.com/e5a4384de1d67657590646b306c6e66746f1174b
Cr-Commit-Position: refs/heads/master@{#415045}
==========

[commit-bot: I haz the power, 2016-08-30 02:45:27]

Patchset 5 (id:??) landed as
https://crrev.com/e5a4384de1d67657590646b306c6e66746f1174b
Cr-Commit-Position: refs/heads/master@{#415045}

[Ian Wen, 2016-08-30 02:46:29]

Description was changed from

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

R=twellington@chromium.org
TBR=boliu@chromium.org, caitkp@chromium.org, dtrainor@chromium.org,
grt@chromium.org, joedow@chromium.org, yfriedman@chromium.org

Committed: https://crrev.com/e5a4384de1d67657590646b306c6e66746f1174b
Cr-Commit-Position: refs/heads/master@{#415045}
==========

to

==========
Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

This reverts commit 21571ae1ee47d614541f814bd98dfbd71f561dbc, which was
committed in M52.

Reason for revert: in android N, locale is defined in finer granularity,
and simply falling back to zh will no longer work.

BUG=641852
Previously reviewed in https://codereview.chromium.org/1931093002

R=twellington@chromium.org
TBR=boliu@chromium.org, caitkp@chromium.org, dtrainor@chromium.org,
grt@chromium.org, joedow@chromium.org, yfriedman@chromium.org

Committed:
https://chromium.googlesource.com/chromium/src/+/e5a4384de1d67657590646b306c6...
==========

[Ian Wen, 2016-08-30 02:46:31]

Committed patchset #5 (id:80001) manually as
e5a4384de1d67657590646b306c6e66746f1174b (presubmit successful).

[commit-bot: I haz the power, 2016-08-30 03:34:03]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)