Commit Graph

22260 Commits

Author SHA1 Message Date
Amit Mahajan
dd871497f0 am e6e41f45: am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'e6e41f453d608b443be315f5e1a223054bfd2b68':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:58:22 +00:00
Amit Mahajan
e6e41f453d am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'a38dfb03c4054dbe08ffab01b8d42329e91fd639':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:44:46 +00:00
Amit Mahajan
a38dfb03c4 am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'c5459430a08351544e6545a16aa07147b186ec7b':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:30:59 +00:00
Amit Mahajan
c5459430a0 am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '480692fab398a080be6648ddf424b3129f2c6cbc':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:17:45 +00:00
Amit Mahajan
480692fab3 am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'e8357caad8880deb23dc04ad5d4d036d41a1ae9f':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:09:12 +00:00
Amit Mahajan
e8357caad8 Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 2015-07-21 16:57:13 +00:00
Julia Reynolds
dd8f30541c am 08b94d5b: am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '08b94d5b067fb68ba049aa611853bf102a4495d2':
  Make 'fingerprint' searchable in Settings.
2015-07-21 16:23:52 +00:00
Julia Reynolds
08b94d5b06 am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '3d94772b082ff9e359e6ad9ebe2ea48292421966':
  Make 'fingerprint' searchable in Settings.
2015-07-21 16:10:31 +00:00
Julia Reynolds
3d94772b08 am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '6712be4a70ecd9d21ae78bf7dc65afc92b277937':
  Make 'fingerprint' searchable in Settings.
2015-07-21 15:57:46 +00:00
Julia Reynolds
6712be4a70 am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit 'd409b70093211df215bc117ccf9ba8d0924e983f':
  Make 'fingerprint' searchable in Settings.
2015-07-21 15:44:21 +00:00
Julia Reynolds
d409b70093 am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit 'f516e7dde0074416dbf51650cbfb9cc763027b27':
  Make 'fingerprint' searchable in Settings.
2015-07-21 15:31:17 +00:00
Julia Reynolds
f516e7dde0 Make 'fingerprint' searchable in Settings.
Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
2015-07-21 14:28:40 +00:00
Daichi Hirono
35197218fc Merge "Turn the eject menu into a button." 2015-07-21 06:14:37 +00:00
Maurice Lam
fed7de4546 am d0577460: am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'd05774600e5ac86cb883041abfb5b407afa04fd3':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 01:47:32 +00:00
Maurice Lam
a5d2be8683 am 6e512e08: am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '6e512e0815c8678621077008498f18e73402ecc3':
  [Fingerprint] Change message in encryption
2015-07-21 01:37:07 +00:00
Maurice Lam
9a93dfa8cb am d7615bba: am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:37:06 +00:00
Maurice Lam
d05774600e am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '3234f0b9bdbe32658d1ebe33e278cfb5185a785b':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 01:35:01 +00:00
Maurice Lam
3234f0b9bd am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'c690d199be82337f3909348443391bbad081d37f':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 01:19:47 +00:00
Maurice Lam
6e512e0815 am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'b8c099519bfc93777de19095c9aa6030ca51b6cc':
  [Fingerprint] Change message in encryption
2015-07-21 01:18:51 +00:00
Maurice Lam
d7615bbaac am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'ec2f7fe57d7a210f226ddcb622e01cf4c45b25b2':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:18:49 +00:00
Maurice Lam
b8c099519b am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'e82793a2de48be5334f3892d96e1e2736a3064c0':
  [Fingerprint] Change message in encryption
2015-07-21 01:04:50 +00:00
Maurice Lam
ec2f7fe57d am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '135c8869fe4cc2cad8df07172c2f225da23ef07e':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:04:49 +00:00
Maurice Lam
c690d199be am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'd5af0d8b8a973a2f82024f5358572b609e47a758':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 01:04:47 +00:00
Maurice Lam
e82793a2de am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '6132fe1c02a944bf87604a4773e091124de4954d':
  [Fingerprint] Change message in encryption
2015-07-21 00:49:50 +00:00
Maurice Lam
135c8869fe am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '8ebd1e2c06d8526dd8a3081d743bc77ee565fc10':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:49:49 +00:00
Maurice Lam
d5af0d8b8a am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'd85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 00:49:46 +00:00
Maurice Lam
d85fafce30 Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 2015-07-21 00:38:39 +00:00
Maurice Lam
6132fe1c02 am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'd10026cbfde671448b702fde345da52ac7569d04':
  [Fingerprint] Change message in encryption
2015-07-21 00:33:23 +00:00
Maurice Lam
8ebd1e2c06 am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:33:22 +00:00
Maurice Lam
d10026cbfd Merge "[Fingerprint] Change message in encryption" into mnc-dev 2015-07-21 00:25:16 +00:00
Maurice Lam
af57ec8831 Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 2015-07-21 00:22:03 +00:00
Jim Miller
9e81045a95 am 717f4879: am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '717f487964b2e0029119b591f7f241e3262f7006':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-21 00:16:03 +00:00
Geoff Mendal
8e29907d4d am d28d8d9d: (-s ours) am 88c6a310: (-s ours) am e4af992f: (-s ours) am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit 'd28d8d9d1896e530a45a533ab873cfa7009a480a':
  Import translations. DO NOT MERGE
2015-07-21 00:15:25 +00:00
Geoff Mendal
3dd9586175 am 5eca3ca5: (-s ours) am 52c37bef: (-s ours) am a6e9efbe: (-s ours) am 4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '5eca3ca517192bed290c7b6e1bf8894d9a21bfc9':
  Import translations. DO NOT MERGE
2015-07-21 00:15:23 +00:00
Makoto Onuki
b2121d9bdd am 0968056b: am f5ac0b6a: am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '0968056bac9c4eb808792eb6ae0b387899924b89':
  Fix ugly text wrapping on non-english locales
2015-07-21 00:14:03 +00:00
Jason Monk
c2f431debe am 97c68c18: am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '97c68c181dba345139e6ae98cdc4128b1744e1a0':
  Handle monkey crash
2015-07-21 00:14:01 +00:00
Sungmin Choi
fab7c109b7 Fix bug to force to close once change Bearer on APN
Bug: 22544257
Change-Id: I43eea4034c3d106b8e3f8e4f999f389db04b7567
2015-07-20 17:09:42 -07:00
Maurice Lam
5cceb312fd [ScreenLock] Change title for RedactionInterstitial
Change the title for RedactionInterstital to "Notifications".

Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
2015-07-20 23:42:52 +00:00
Jim Miller
717f487964 am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'b858853dc395498acc75422e568d7156062c4f9c':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-20 23:38:06 +00:00
Jim Miller
b858853dc3 am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'a8f8879895edd86fd206fc1a8d2d684e09fcc57f':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-20 23:28:14 +00:00
Geoff Mendal
d28d8d9d18 am 88c6a310: (-s ours) am e4af992f: (-s ours) am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '88c6a310db9495a83e093a173f1e451b622c5eae':
  Import translations. DO NOT MERGE
2015-07-20 23:26:18 +00:00
Geoff Mendal
5eca3ca517 am 52c37bef: (-s ours) am a6e9efbe: (-s ours) am 4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '52c37befda5331cff8e618bdd7d5a63e4e32047e':
  Import translations. DO NOT MERGE
2015-07-20 23:26:17 +00:00
Jim Miller
a8f8879895 am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'd74a36031cbe87a8a18f4ffc99aaa399245f181c':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-20 23:20:15 +00:00
Geoff Mendal
88c6a310db am e4af992f: (-s ours) am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit 'e4af992fef82ab26670db5adc7957b4385baa86c':
  Import translations. DO NOT MERGE
2015-07-20 23:06:47 +00:00
Geoff Mendal
52c37befda am a6e9efbe: (-s ours) am 4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit 'a6e9efbeb3bd83db0ad5d45a2bafb306935e02dd':
  Import translations. DO NOT MERGE
2015-07-20 23:06:46 +00:00
Jim Miller
d74a36031c am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '3977df037c1cdd1bef92e3f4195c6e7b847a1c28':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-20 23:05:51 +00:00
Geoff Mendal
e4af992fef am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit 'a74f78b188d11b0dfd7651aff77b2db4eae0278e':
  Import translations. DO NOT MERGE
2015-07-20 22:57:40 +00:00
Geoff Mendal
a6e9efbeb3 am 4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '4a0662dddeeea4fa9a62a97b5dd9e996860db7cd':
  Import translations. DO NOT MERGE
2015-07-20 22:57:38 +00:00
Geoff Mendal
a74f78b188 am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '1992d5a1fc616f5132315ee6d4659c20728acad6':
  Import translations. DO NOT MERGE
2015-07-20 22:52:48 +00:00
Jim Miller
3977df037c Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev 2015-07-20 22:50:30 +00:00