199895 Commits

Author SHA1 Message Date
Chris Wren
a2acd4bc2b am 1d8d111a: am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev
* commit '1d8d111a16bc696217162ddbd4cf08ca2bc5eb21':
  instrument notification longpress controls
  induct a bunch of new logging categories.
2015-06-10 17:12:33 +00:00
Geoff Mendal
6275ec3d8d am 1faf2a6c: (-s ours) am 9cf2547d: (-s ours) am b381bcc1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1faf2a6c00d64378a832137d64090d457d381e9e':
  Import translations. DO NOT MERGE
2015-06-10 17:12:28 +00:00
Geoff Mendal
6244b51b2b am def22de2: (-s ours) am 530595ac: (-s ours) am 36eb6d5f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'def22de21a69856f7dacb2c0cb30261e6649644b':
  Import translations. DO NOT MERGE
2015-06-10 17:12:23 +00:00
Geoff Mendal
9141570574 am 1e557219: (-s ours) am e3b1dc3c: (-s ours) am b6c026be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1e557219faa252d9bee697acd3cb1f5f8b2c76fe':
  Import translations. DO NOT MERGE
2015-06-10 17:12:18 +00:00
Geoff Mendal
d958f48c8e am 2fc53f85: (-s ours) am 68c80fcc: (-s ours) am 1947d9f5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '2fc53f85d7dc11b216ebd3a692dff22bdfef306f':
  Import translations. DO NOT MERGE
2015-06-10 17:12:13 +00:00
Neil Fuller
afcbb4bb91 am c15b4bcf: am bbb06b32: am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev
* commit 'c15b4bcf3d42b90c955bc3a19bc7eb5b23cad361':
  Stop showing long names for local timezones when it is ambiguous
2015-06-10 17:12:07 +00:00
Andrew Flynn
139c456e4d am 4fda24fe: am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
* commit '4fda24fece717f4deded74977753e9aa6caf551a':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
2015-06-10 17:12:01 +00:00
Andrei Stingaceanu
3210869291 am 52243ad3: (-s ours) am 15f4dd72: resolved conflicts for merge of 1c96a941 to mnc-ub-dev
* commit '52243ad30da4d3c1ac27f8f8842d3d0468b6c5e3':
  Completely remove ExtractActionMode from ExtractEditLayout
2015-06-10 17:11:56 +00:00
Geoff Mendal
4fdc38640a Merge "Import translations. DO NOT MERGE" 2015-06-10 16:34:32 +00:00
Geoff Mendal
f88f3ca583 Import translations. DO NOT MERGE
Change-Id: I7a72216af4417c0a3ac5d4f1833cadeabac6f4eb
Auto-generated-cl: translation import
2015-06-10 09:31:09 -07:00
Chris Wren
1d8d111a16 am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev
* commit '7f588404c531db878597f1221d56907c5c40de5e':
  instrument notification longpress controls
  induct a bunch of new logging categories.
2015-06-10 15:02:04 +00:00
Geoff Mendal
1faf2a6c00 am 9cf2547d: (-s ours) am b381bcc1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '9cf2547d8bb5671e5223ba3a645f71c0f6cfdc72':
  Import translations. DO NOT MERGE
2015-06-10 15:01:58 +00:00
Geoff Mendal
def22de21a am 530595ac: (-s ours) am 36eb6d5f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '530595ac9fe59faa59e863073777bfec9e72cd2d':
  Import translations. DO NOT MERGE
2015-06-10 15:01:53 +00:00
Geoff Mendal
1e557219fa am e3b1dc3c: (-s ours) am b6c026be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e3b1dc3ca9f1837ad7e3d9630adb228f368e0602':
  Import translations. DO NOT MERGE
2015-06-10 15:01:48 +00:00
Geoff Mendal
2fc53f85d7 am 68c80fcc: (-s ours) am 1947d9f5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '68c80fcc02005e7f2eb60dd578df215258cde9f9':
  Import translations. DO NOT MERGE
2015-06-10 15:01:43 +00:00
Neil Fuller
c15b4bcf3d am bbb06b32: am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev
* commit 'bbb06b322bcd63a75484b2a54666141fc0a2b57e':
  Stop showing long names for local timezones when it is ambiguous
2015-06-10 15:01:38 +00:00
Andrew Flynn
4fda24fece am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
* commit 'c570a6290f6051346bbbfb0e9e8fbe8d7ede8d99':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
2015-06-10 15:01:32 +00:00
Andrei Stingaceanu
52243ad30d am 15f4dd72: resolved conflicts for merge of 1c96a941 to mnc-ub-dev
* commit '15f4dd72192f11982a41d2fd92b7c2302b521476':
  Completely remove ExtractActionMode from ExtractEditLayout
2015-06-10 15:01:27 +00:00
Chris Wren
7f588404c5 am 300a1416: Merge changes from topic \'tron\' into mnc-dev
* commit '300a141650dc17d2a893b55133c62b0353d2a9bb':
  instrument notification longpress controls
  induct a bunch of new logging categories.
2015-06-10 14:54:35 +00:00
Geoff Mendal
9cf2547d8b am b381bcc1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b381bcc185340a09fbb576b2aa3ae970b1806d34':
  Import translations. DO NOT MERGE
2015-06-10 14:54:30 +00:00
Geoff Mendal
530595ac9f am 36eb6d5f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '36eb6d5f46c82a3df42074a3beedc748dec7f438':
  Import translations. DO NOT MERGE
2015-06-10 14:54:24 +00:00
Geoff Mendal
e3b1dc3ca9 am b6c026be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b6c026bec1430f7c31aa72cc9b2e160eca0464fd':
  Import translations. DO NOT MERGE
2015-06-10 14:54:20 +00:00
Geoff Mendal
68c80fcc02 am 1947d9f5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1947d9f55e8b5966a473dbc7a75967325e32ae8b':
  Import translations. DO NOT MERGE
2015-06-10 14:54:16 +00:00
Neil Fuller
bbb06b322b am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev
* commit '8e095594a640a82b850ff3990bb690920eba921c':
  Stop showing long names for local timezones when it is ambiguous
2015-06-10 14:53:54 +00:00
Andrew Flynn
c570a6290f am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
* commit 'da9bbf725592c6482d6fbce18ef8c258b18e4fc8':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
2015-06-10 14:53:49 +00:00
Andrei Stingaceanu
15f4dd7219 resolved conflicts for merge of 1c96a941 to mnc-ub-dev
Change-Id: I37613fa8fc8ff0d91c8cc2f8c389326c30a6b297
2015-06-10 15:46:44 +01:00
Chris Wren
300a141650 Merge changes from topic 'tron' into mnc-dev
* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.
2015-06-10 14:14:41 +00:00
Geoff Mendal
b381bcc185 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:10:00 +00:00
Geoff Mendal
d86ab3b324 Import translations. DO NOT MERGE
Change-Id: I43d33e6e42b0bbeeec7cc330bbb9c068fa3828d2
Auto-generated-cl: translation import
2015-06-10 09:04:16 -05:00
Geoff Mendal
36eb6d5f46 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:00:34 +00:00
Geoff Mendal
b6c026bec1 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:59:02 +00:00
Geoff Mendal
a126f69419 Import translations. DO NOT MERGE
Change-Id: I20b6c72047df24a7b6f9ad21db1234bdc4889925
Auto-generated-cl: translation import
2015-06-10 08:58:30 -05:00
Geoff Mendal
1947d9f55e Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:57:32 +00:00
Geoff Mendal
09e34e989c Import translations. DO NOT MERGE
Change-Id: I8f8557a777e3b2ed58593aa20d1a2b0f2a5aa33b
Auto-generated-cl: translation import
2015-06-10 08:55:37 -05:00
Geoff Mendal
c960f3aa34 Import translations. DO NOT MERGE
Change-Id: Id91c1fc06d73c8f99d53a5fce6d08ef9922b5d07
Auto-generated-cl: translation import
2015-06-10 08:52:40 -05:00
Geoff Mendal
497e846b5a Merge "Import translations. DO NOT MERGE" 2015-06-10 13:03:14 +00:00
Geoff Mendal
fc8eaf0894 Import translations. DO NOT MERGE
Change-Id: Iad81c74d4c36a30bb478892e34456b5713d22342
Auto-generated-cl: translation import
2015-06-10 08:02:11 -05:00
Geoff Mendal
e9b37ac982 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:56:32 +00:00
Geoff Mendal
e8316f974e Import translations. DO NOT MERGE
Change-Id: I579a6e7b41757f72728d79a2680d55b82c239189
Auto-generated-cl: translation import
2015-06-10 07:51:57 -05:00
Geoff Mendal
f4a9d6ed64 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:51:29 +00:00
Geoff Mendal
3f88ea6c86 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:49:41 +00:00
Geoff Mendal
39da55fece Import translations. DO NOT MERGE
Change-Id: I444c2fffad2519fbb7b8bb43d6fbb5bb89261ac3
Auto-generated-cl: translation import
2015-06-10 07:49:13 -05:00
Geoff Mendal
8c623de5fb Import translations. DO NOT MERGE
Change-Id: Ic7ad9f69097b0acee4bb16f2c792ac01116f61fb
Auto-generated-cl: translation import
2015-06-10 07:46:26 -05:00
Geoff Mendal
21ca82f3f6 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:34:53 +00:00
Geoff Mendal
3c8a0debbf Import translations. DO NOT MERGE
Change-Id: I6eba661705980ad16917844a08123cb49220a102
Auto-generated-cl: translation import
2015-06-10 07:32:57 -05:00
Geoff Mendal
7098e6410f Import translations. DO NOT MERGE
Change-Id: Ibb009dbb1ae21a98b16ee806b0e595b9f7299bd8
Auto-generated-cl: translation import
2015-06-10 07:27:29 -05:00
Neil Fuller
8e095594a6 Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 2015-06-10 12:23:54 +00:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Alex Chau
f5d0813930 am 5e02c549: am ad914181: am ccfa54f4: Merge "Add strings for notification shown upon work profile deletion" into mnc-dev
* commit '5e02c5494743bb7c693761b03c3c24dca9624d60':
  Add strings for notification shown upon work profile deletion
2015-06-10 11:18:29 +00:00