OSDN Git Service
Hugo Benichi [Mon, 31 Jul 2017 01:58:33 +0000 (01:58 +0000)]
Merge "Logging improvements when NetworkCapabilities change" am:
f60a38e152
am:
bdfb4ee19c
Change-Id: Ie7f90ac6b8073e756ff14afcaac7ed291b165e87
Hugo Benichi [Mon, 31 Jul 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
am:
f60a38e152
Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c
Treehugger Robot [Mon, 31 Jul 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.
Bug:
63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c
(cherry pick from commit
683ea489d302b494ab40c0d5dc97d352a59d8aa9)
Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
TreeHugger Robot [Sat, 29 Jul 2017 19:58:54 +0000 (19:58 +0000)]
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
Jeff Sharkey [Sat, 29 Jul 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Add a missing null check" into oc-dev
am:
101fca656d
Change-Id: Ifa868b17837796dec93c93119260a92f4241f624
Jeff Sharkey [Sat, 29 Jul 2017 15:56:14 +0000 (15:56 +0000)]
Merge "Add a missing null check" into oc-dev
Wei Wang [Sat, 29 Jul 2017 03:00:09 +0000 (03:00 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours
am:
f173b2a4c3 -s ours
Change-Id: Id1cfb56bffc9bcf477d209efbd3f1eb19aee08d2
Wei Wang [Sat, 29 Jul 2017 02:52:46 +0000 (02:52 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours
am:
452b8f2bd3 -s ours
Change-Id: Iaee8bab95acf6490e468d1a0df66b6aea6e61398
Wei Wang [Sat, 29 Jul 2017 02:46:12 +0000 (02:46 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
am:
a763fdba09 -s ours
Change-Id: Id38ed8a73decbf2dc3ce4e657e69fe838acb50c1
Wei Wang [Tue, 18 Apr 2017 18:26:26 +0000 (11:26 -0700)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
Test: manual
Bug:
36973866
Change-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91
(cherry picked from commit
c5706f651a0462e9ae5a91c9a026d44710b1f8ea)
Svet Ganov [Fri, 28 Jul 2017 22:35:06 +0000 (15:35 -0700)]
Add a missing null check
Test: manual
bug::
62755026
Change-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09
Svet Ganov [Fri, 28 Jul 2017 21:23:04 +0000 (21:23 +0000)]
Handle case for missing permissions - fix NPE
am:
39cc33f192
Change-Id: I5fc2ebc009baa242bf9848af62a8f9231afa8045
Svet Ganov [Fri, 28 Jul 2017 20:10:33 +0000 (13:10 -0700)]
Handle case for missing permissions - fix NPE
Test: manual
Bug:
62755026
Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8
Andrew Solovay [Fri, 28 Jul 2017 20:18:34 +0000 (20:18 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am:
04d43a6a7b
Change-Id: I2936fc48db92ad5846b5c72549d265ce4180686d
Andrew Solovay [Fri, 28 Jul 2017 20:05:04 +0000 (20:05 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
Benjamin Miller [Fri, 28 Jul 2017 17:30:16 +0000 (17:30 +0000)]
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am:
91f16ace4f
Change-Id: I9dd5d6641307589250d781dce11c4f2186b3c8fb
Steven Moreland [Fri, 28 Jul 2017 17:21:47 +0000 (10:21 -0700)]
SurfaceTexture.cpp: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: SurfaceTexture.cpp finds headers
Bug:
63762847
Change-Id: I3ec1b888c226c2894649d9f9a8f8203891c1ab02
TreeHugger Robot [Fri, 28 Jul 2017 17:11:28 +0000 (17:11 +0000)]
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
Svetoslav Ganov [Fri, 28 Jul 2017 16:42:09 +0000 (16:42 +0000)]
Report permission flags for all protections based on SDK
am:
adb8c522a8
Change-Id: I259df147b8345f6bdba5a1ed31d01d3c42e90518
Benjamin Miller [Mon, 24 Jul 2017 08:11:39 +0000 (10:11 +0200)]
Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting
VPNs don't start except a DPC's configured always-on VPN. Clarified version behaviors.
Staged at: go/dac-stage/reference/android/os/UserManager.html#DISALLOW_CONFIG_VPN
Test: make ds-docs and output staged UserManager page
Bug:
63582789
Change-Id: I83c0c6cc580b9d1d224a94e073f559f23cf4d672
(cherry picked from commit
1f83e4d498f4a4f2c8796cdefe330a4caf258424)
Svetoslav Ganov [Fri, 28 Jul 2017 05:46:53 +0000 (05:46 +0000)]
Report permission flags for all protections based on SDK
We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.
Test: All permission tests pass
Added a new test to ensure no protection flags reported
for normal and dangerous permissions
Change-Id: I87b10a7695d8ecfa7156525d6f3d101fc0639513
bug:
62755026
Bart Sears [Fri, 28 Jul 2017 05:17:48 +0000 (05:17 +0000)]
Revert "Report permission flags for all protections based on SDK"
am:
784b56e1e6
Change-Id: I80086249438fff193dc64d9c4d1a6b1468f8c4a1
Bart Sears [Fri, 28 Jul 2017 05:05:38 +0000 (05:05 +0000)]
Revert "Report permission flags for all protections based on SDK"
This reverts commit
852cf98cb8a4b9b56da84a96708c087996e119d2.
Change-Id: I62763bf85ec95a02a245c6b503aa34bb0e9d997a
Android Build Merger (Role) [Fri, 28 Jul 2017 02:51:00 +0000 (02:51 +0000)]
Merge "Report permission flags for all protections based on SDK am:
852cf98cb8" into oc-dev-plus-aosp
Svetoslav Ganov [Fri, 28 Jul 2017 02:48:37 +0000 (02:48 +0000)]
Report permission flags for all protections based on SDK
am:
852cf98cb8
Change-Id: Id83fa00277f6262139024eee46312bf18cd7b691
Hall Liu [Fri, 28 Jul 2017 02:47:36 +0000 (02:47 +0000)]
Merge "Un-hide the MBMS streaming APIs" am:
a50e17aea2
am:
8c4179e88c
Change-Id: Ic6c1ec0845cae8b2134b9cb043d185f5e532596c
Hall Liu [Fri, 28 Jul 2017 02:40:20 +0000 (02:40 +0000)]
Merge "Un-hide the MBMS streaming APIs"
am:
a50e17aea2
Change-Id: Icd8ebf0e351914cdfb0f0c15343e2d2024706d6b
Treehugger Robot [Fri, 28 Jul 2017 02:31:52 +0000 (02:31 +0000)]
Merge "Un-hide the MBMS streaming APIs"
Svetoslav Ganov [Thu, 27 Jul 2017 19:53:18 +0000 (12:53 -0700)]
Report permission flags for all protections based on SDK
We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.
Test: All permission tests pass
Added a new test to ensure no protection flags reproted
for normal and dangerous permissions
bug:
62755026
Change-Id: I72547b0146e6b6919803e33ff64b7208c4a255ad
Hall Liu [Tue, 18 Jul 2017 18:30:27 +0000 (11:30 -0700)]
Un-hide the MBMS streaming APIs
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.
Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
Dirk Dougherty [Fri, 9 Jun 2017 21:43:32 +0000 (14:43 -0700)]
Cherry-pick from master Doc change: Add API 26 to @since list
Add API 26 to @since list and turn off preview watermarking.
Fix has been successfully submitted in master and affects doc files
only.
Bug:
62087404
Bug:
64123587
Test: make ds-docs
Original change-Id: Idcf84882a1a1fe0864ee6ff3d0af6cd857c73a06
Change-Id: I28700ad15d931256d9dfc1016df546bd2f0e718f
Colin Cross [Thu, 27 Jul 2017 19:38:35 +0000 (19:38 +0000)]
Enable multi-dex for dx
am:
6b13ebc7f1
Change-Id: I78486dd1d460673ae25c80994b474cf8a044b660
Colin Cross [Tue, 20 Jun 2017 22:38:05 +0000 (15:38 -0700)]
Enable multi-dex for dx
Add LOCAL_DX_FLAGS := --multi-dex where it is enabled for jack.
Also stop enabling multi-dex when coverge is enabled, since
multi-dex is now enalbed unconditionally.
Test: builds
Change-Id: I67fedcdd5bb5d7091468bddcb0c22bab720a51d2
Merged-In: I67fedcdd5bb5d7091468bddcb0c22bab720a51d2
(cherry picked from commit
17ffa24277380c69bf365fa595e7d4e6e51825eb)
Steven Moreland [Thu, 27 Jul 2017 17:19:56 +0000 (17:19 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours
am:
4d28662818 -s ours
Change-Id: I2a858e502449ace2c9c40ecb53e00dfff6d64dd8
Steven Moreland [Thu, 27 Jul 2017 17:13:38 +0000 (17:13 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
am:
c372715beb -s ours
Change-Id: I57d45557c585238f9e98e0bf81c06058235d7e74
Neil Fuller [Thu, 27 Jul 2017 17:05:27 +0000 (17:05 +0000)]
Merge "Tidy up RulesManagerService code" am:
d5517c39e8
am:
ef21b72dd1
Change-Id: I600ee50f8c5c463853035c2a83e43d2ce0149caa
Treehugger Robot [Thu, 27 Jul 2017 17:00:13 +0000 (17:00 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
Neil Fuller [Thu, 27 Jul 2017 16:58:02 +0000 (16:58 +0000)]
Merge "Tidy up RulesManagerService code"
am:
d5517c39e8
Change-Id: I56afb0031c2768ea5aed0797b64c9ebda91be8e8
Neil Fuller [Thu, 27 Jul 2017 16:48:58 +0000 (16:48 +0000)]
Merge "Tidy up RulesManagerService code"
Steven Moreland [Wed, 26 Jul 2017 19:21:58 +0000 (12:21 -0700)]
ActivityManagerService: fix nativehelper includes
Bug:
63762847
Test: none
Merged-In: I9f9497990fbf0697d05445f563ad46a28d6d6eeb
Change-Id: I964c88cb74f0287dfc6634fbfcd3210a7d984213
Hugo Benichi [Thu, 27 Jul 2017 14:50:14 +0000 (14:50 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156
am:
ef7d6d93c3
Change-Id: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf
Hugo Benichi [Thu, 27 Jul 2017 14:43:48 +0000 (14:43 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"
am:
3451fb6156
Change-Id: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6
Treehugger Robot [Thu, 27 Jul 2017 14:36:47 +0000 (14:36 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"
Neil Fuller [Thu, 27 Jul 2017 13:42:39 +0000 (13:42 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173
am:
3e928af733
Change-Id: I885b05915d72d284784e1eabe548a9aef048dbc5
Neil Fuller [Thu, 27 Jul 2017 13:35:23 +0000 (13:35 +0000)]
Merge "Alter condition for starting RulesManagerService"
am:
a338679173
Change-Id: I442dd6a30f022f92fb3fd8a0a5cca58d4ec77208
Treehugger Robot [Thu, 27 Jul 2017 13:25:49 +0000 (13:25 +0000)]
Merge "Alter condition for starting RulesManagerService"
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:18:06 +0000 (13:18 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096
am:
7dc29d076f
Change-Id: I7044177aa99426810c23e2100633d3f2c85d5c8e
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:11:44 +0000 (13:11 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
am:
9b9e823096
Change-Id: I54b658a7911d604af79916f92c8406472e3c9ccb
Treehugger Robot [Thu, 27 Jul 2017 13:01:05 +0000 (13:01 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Hugo Benichi [Tue, 25 Jul 2017 12:57:51 +0000 (21:57 +0900)]
NetworkNotificationManager: correctly handle existing notifications
This patch corrects a regression added by commit
fb2609d3eee1 that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.
Contrary to the situation before commit
fb2609d3eee1, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.
Bug:
63676954
Bug:
62503737
Test: runtest frameworks-net, added new unit tests
Change-Id: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
Narayan Kamath [Thu, 27 Jul 2017 11:45:08 +0000 (11:45 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d
am:
19d39ee384
Change-Id: I7ac73bf032ea640bc65c5c85df75330133255052
Narayan Kamath [Thu, 27 Jul 2017 11:37:02 +0000 (11:37 +0000)]
Merge "Remove CoreTests: HeapTest"
am:
c3fd3b8c7d
Change-Id: If6565f8bc8a655d3d7422f57db3dd6160459b092
Narayan Kamath [Thu, 27 Jul 2017 11:26:10 +0000 (11:26 +0000)]
Merge "Remove CoreTests: HeapTest"
Przemyslaw Szczepaniak [Wed, 26 Jul 2017 12:12:43 +0000 (12:12 +0000)]
Revert "Default 'persist.sys.timezone' property to GMT if not set on init."
Telephony code depends on persist.sys.timezone not being set as a signal
to deduce a timezone from sim card information.
This reverts commit
20e020536ebf999c4acb759960ae6e4bfff6ba67.
Bug:
64056758
Change-Id: I8db204bcffbdb960124b1ae0e02d53b27dd310a4
Bill Yi [Thu, 27 Jul 2017 00:32:01 +0000 (00:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours
am:
81a1d589ba -s ours
Change-Id: Idd097c7c84ea6e7802bd45f6703bff6d14ecea2e
Bill Yi [Thu, 27 Jul 2017 00:18:45 +0000 (00:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours
am:
e2f2fbaea1 -s ours
Change-Id: I28f04846c8494e19d0b04e96eaf0a8448e1fab43
Bill Yi [Wed, 26 Jul 2017 23:54:36 +0000 (23:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours
am:
0ceb3853e8 -s ours
Change-Id: Idf42771340f4f8591ebc3b8e889798330147e7bb
Bill Yi [Wed, 26 Jul 2017 23:44:16 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours
am:
995029b529 -s ours
Change-Id: Iea953c1a17f18528e1c3ae5b3663419745e88b79
Bill Yi [Wed, 26 Jul 2017 23:38:01 +0000 (23:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours
am:
aec51f497c -s ours
Change-Id: I2f855bb13f287547ab5f42c05dada215465d0e5c
Bill Yi [Wed, 26 Jul 2017 23:34:30 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9724569903 -s ours
am:
18b818e2dd -s ours
Change-Id: Ia30698cfb205b69d5d954ec4f9405fa228aa572e
Bill Yi [Wed, 26 Jul 2017 23:10:06 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours
am:
603a43e5c3 -s ours
Change-Id: I57e366359829001bd92fa0b77d8068cb30c18456
Bill Yi [Wed, 26 Jul 2017 23:09:07 +0000 (23:09 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev am:
cd955ca6e5 -s ours
am:
f66ddc099a -s ours
Change-Id: Ia6630c6dd3cf9daf78fd3f07ebdc7515c548a3bd
Bill Yi [Wed, 26 Jul 2017 23:07:26 +0000 (23:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours
am:
9cf9d294ef -s ours
Change-Id: I559573199120374e303bfaae5d5c18660dbb369e
Bill Yi [Wed, 26 Jul 2017 22:56:00 +0000 (22:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
581a166ae1 -s ours
Change-Id: If1bba4f6237b39c86fc5fa998376683d78cd483e
Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours
am:
8080362358 -s ours
Change-Id: I8243f6ee311cd730ace4f9bca4693ccdabfa7523
Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours
am:
6f24c015ef -s ours
Change-Id: I1926ae43168fa88c14390130282d1517091c7129
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3875d1a103 -s ours
Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d
Bill Yi [Wed, 26 Jul 2017 22:49:37 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c2b08ca602 -s ours
Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2
Bill Yi [Wed, 26 Jul 2017 22:46:32 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fb02073a66 -s ours
Change-Id: I497f27dc7f50f9914b5157a4846c05ef4091abfd
Bill Yi [Wed, 26 Jul 2017 22:46:01 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours
am:
cccb304acf -s ours
Change-Id: Ic9fa84f60261dd11093f38c3e02845dc3da2a3a2
Bill Yi [Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9724569903 -s ours
Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42
Bill Yi [Wed, 26 Jul 2017 22:40:44 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours
am:
611a6ffe29 -s ours
Change-Id: I4c8c61a56288b7b4fdad4ccca07c51c0a8cfb38c
TreeHugger Robot [Wed, 26 Jul 2017 22:40:12 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:39:47 +0000 (22:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
am:
cd955ca6e5 -s ours
Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b
TreeHugger Robot [Wed, 26 Jul 2017 22:39:30 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:37:25 +0000 (22:37 +0000)]
Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours
am:
120c3e9874 -s ours
Change-Id: If6b7cc81b779c33a83506ccb0da87b7a643dd177
Bill Yi [Wed, 26 Jul 2017 22:35:23 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
am:
3bcdbff889 -s ours
Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878
Bill Yi [Wed, 26 Jul 2017 22:28:59 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a1bde91384 -s ours
Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c
Bill Yi [Wed, 26 Jul 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9bc30ce545 -s ours
Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935
Bill Yi [Wed, 26 Jul 2017 22:21:36 +0000 (22:21 +0000)]
Import translations. DO NOT MERGE
am:
495d4ce1b9 -s ours
Change-Id: I1294580d3e9485f0367aca366054336d0dc3b9ed
Bill Yi [Wed, 26 Jul 2017 22:21:32 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4ba2bc4d32 -s ours
Change-Id: Ib331eb4cf8882b271b11b756c43818a5b38c1664
TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 22:04:23 +0000 (22:04 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 22:01:57 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fbfd283125 -s ours
Change-Id: I39f298c62ae870a0a764a1cb60d766e8e03f692b
Android Build Merger (Role) [Wed, 26 Jul 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 21:58:32 +0000 (21:58 +0000)]
Import translations. DO NOT MERGE
am:
69d0838208 -s ours
Change-Id: I25641bf4fbc60d8e40887a43965a602000bc8377
TreeHugger Robot [Wed, 26 Jul 2017 21:50:54 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 18:03:33 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I228aaf428e6298a9077e8f277c3e6e26b5ebd7a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13f52e0726334b4ff47a780e3d5c41074d96aada
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:01:07 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8b8dd3e35096ba23f1dd7cc01beba7b392167591
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:00:00 +0000 (11:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfe4076b754c857472076b3aa9d9fd0b491e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:57:20 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9be29c557742c6c1d233376f49088bcb3309bfb3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import