Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 37f70d2951 Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5 Paul Duffin 2017-06-14 14:36:55 +00:00
• 7b2c6ed6a5 Fix dependencies of packages that target earlier releases Paul Duffin 2017-06-13 12:28:59 +01:00
• 441c8b85a6 Remove usages of ActionBarActivity. am: d3b23f568a am: 10244bf817 Aurimas Liutikas 2017-06-06 21:27:52 +00:00
• 10244bf817 Remove usages of ActionBarActivity. am: d3b23f568a Aurimas Liutikas 2017-06-06 21:24:03 +00:00
• d3b23f568a Remove usages of ActionBarActivity. Aurimas Liutikas 2017-05-18 11:16:47 -07:00
• 11224977e7 Remove usages of ActionBarActivity. Aurimas Liutikas 2017-05-18 11:16:47 -07:00
• 33e6be1db8 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev am: 7ffdc9c333 am: a25e716645 Tom Taylor 2017-05-01 18:29:30 +00:00
• a25e716645 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev am: 7ffdc9c333 Tom Taylor 2017-05-01 18:21:56 +00:00
• 7ffdc9c333 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev Tom Taylor 2017-05-01 18:09:08 +00:00
• db45a19fe5 37544704 PduPersister is not doing a safe Uri comparison Tom Taylor 2017-04-27 10:57:28 -07:00
• 7eb0aa9da9 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. am: 5aa1187f86 am: 54abffd219 Malcolm Chen 2017-05-01 16:19:47 +00:00
• 54abffd219 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. am: 5aa1187f86 Malcolm Chen 2017-05-01 16:11:07 +00:00
• 5aa1187f86 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. Malcolm Chen 2017-04-27 14:54:12 -07:00
• 7424571ac4 Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 am: efad207abc am: dd192a650b -s ours Sanket Padawe 2017-03-23 01:07:04 +00:00
• dd192a650b Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 am: efad207abc Sanket Padawe 2017-03-23 00:58:09 +00:00
• efad207abc Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 Sanket Padawe 2017-03-23 00:45:48 +00:00
• 56eaeedbb4 Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. Sanket Padawe 2017-03-20 15:09:23 -07:00
• 616dc26461 Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. Sanket Padawe 2017-03-20 15:09:23 -07:00
• 09f7cfd826 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 am: ebe4ce865f am: 06dbece4c5 -s ours Matt Sarett 2017-03-15 17:19:34 +00:00
• 06dbece4c5 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 am: ebe4ce865f Matt Sarett 2017-03-15 17:14:33 +00:00
• ebe4ce865f Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 Matt Sarett 2017-03-15 17:10:03 +00:00
• ffa6f9ac89 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 Matt Sarett 2017-03-15 17:05:02 +00:00
• d7b191a016 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b Matt Sarett 2017-03-15 16:59:32 +00:00
• 172aeda52b Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 Matt Sarett 2017-03-15 16:54:02 +00:00
• 7fb08c55f5 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours Matt Sarett 2017-03-15 16:49:25 +00:00
• cc1dbfc497 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 Matt Sarett 2017-03-15 16:45:22 +00:00
• 93facf6314 Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec Matt Sarett 2017-03-15 16:39:46 +00:00
• 0cf3a7d3ec Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e Matt Sarett 2017-03-15 16:34:47 +00:00
• 60519c717e Update callers *GifCloseFile for new GIFLIB DO NOT MERGE Matt Sarett 2015-08-24 11:35:24 -04:00
• ee40b6007d Refactor code incompatible with Mockito 2.7.13 am: d529415c68 am: 65a7c6845d am: 0188c2ac3e Paul Duffin 2017-03-10 00:08:31 +00:00
• 0188c2ac3e Refactor code incompatible with Mockito 2.7.13 am: d529415c68 am: 65a7c6845d Paul Duffin 2017-03-09 23:59:31 +00:00
• 65a7c6845d Refactor code incompatible with Mockito 2.7.13 am: d529415c68 Paul Duffin 2017-03-09 23:56:06 +00:00
• d529415c68 Refactor code incompatible with Mockito 2.7.13 Paul Duffin 2017-03-09 18:49:41 +00:00
• 3dd54cd669 Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 am: 3fc616a742 am: 872137e536 Paul Duffin 2017-03-03 14:47:08 +00:00
• 872137e536 Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 am: 3fc616a742 Paul Duffin 2017-03-03 14:44:15 +00:00
• 3fc616a742 Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 Paul Duffin 2017-03-03 14:41:46 +00:00
• e98e557469 Prepare for removal of junit and android.test classes from Android API (step 1) Paul Duffin 2017-03-01 13:21:11 +00:00
• e0f37bb8e1 22851197 Messaging Application crash with unsupported type's URI Tom Taylor 2017-02-23 10:41:40 -08:00
• 5a41083bb4 Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8 am: 3cce9e3644 am: 613ba55900 Paul Duffin 2017-02-21 18:20:20 +00:00
• 613ba55900 Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8 am: 3cce9e3644 Paul Duffin 2017-02-21 18:10:13 +00:00
• 3cce9e3644 Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8 Paul Duffin 2017-02-21 18:01:15 +00:00
• 991c2e5ab8 Use com.android.messaging.util.Assert instead of junit.framework.Assert Paul Duffin 2017-02-20 14:21:32 +00:00
• 5d2ab59dcd 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 984688e992 am: 103c8bdb63 Tom Taylor 2017-01-17 20:11:26 +00:00
• 8ff9c6abce 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 8495e582a1 am: 8bace8dbea Tom Taylor 2017-01-17 20:11:18 +00:00
• 103c8bdb63 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 984688e992 Tom Taylor 2017-01-17 20:05:11 +00:00
• 8bace8dbea 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 8495e582a1 Tom Taylor 2017-01-17 20:02:06 +00:00
• 984688e992 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 Tom Taylor 2017-01-17 19:59:54 +00:00
• 8495e582a1 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 Tom Taylor 2017-01-17 19:59:54 +00:00
• eece1bd759 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf Tom Taylor 2017-01-17 19:57:24 +00:00
• fb324f89bf 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c Tom Taylor 2017-01-17 19:55:43 +00:00
• 657379f51c 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e Tom Taylor 2017-01-17 19:53:24 +00:00
• cc649e4e1e 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a Tom Taylor 2017-01-17 19:51:36 +00:00
• 82fa311e9a 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 Tom Taylor 2017-01-17 19:49:23 +00:00
• 71d4913462 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb Tom Taylor 2017-01-17 19:46:53 +00:00
• 9f00add2fb 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a Tom Taylor 2017-01-17 19:44:53 +00:00
• 6f763fef7a 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] Tom Taylor 2017-01-11 09:17:01 -08:00
• 65d0bead73 Rename language+country resources to just language Roozbeh Pournader 2017-01-10 20:57:09 -08:00
• 6c7fecc71a 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 am: f07dfd0a19 am: c40e95726f Tom Taylor 2017-01-06 18:17:48 +00:00
• d46ee4aa4f 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 am: 2686c894a4 am: 61c16108ac Tom Taylor 2017-01-06 18:17:38 +00:00
• c40e95726f 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 am: f07dfd0a19 Tom Taylor 2017-01-06 18:12:25 +00:00
• 61c16108ac 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 am: 2686c894a4 Tom Taylor 2017-01-06 18:11:46 +00:00
• f07dfd0a19 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 Tom Taylor 2017-01-06 18:07:43 +00:00
• 2686c894a4 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 Tom Taylor 2017-01-06 18:07:39 +00:00
• 0d9e6a3cf5 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 Tom Taylor 2017-01-06 18:03:43 +00:00
• 728c4943e9 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 Tom Taylor 2017-01-06 17:59:14 +00:00
• 508f541438 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 Tom Taylor 2017-01-06 17:56:08 +00:00
• 2917015529 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 Tom Taylor 2017-01-06 17:51:59 +00:00
• c708e8fb35 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 Tom Taylor 2017-01-06 17:48:29 +00:00
• cefccea7b4 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 Tom Taylor 2017-01-06 17:45:00 +00:00
• b44b56b779 33388925 Mismatched new vs delete in framesequence library am: 837474a376 Tom Taylor 2017-01-06 17:41:33 +00:00
• 837474a376 33388925 Mismatched new vs delete in framesequence library Tom Taylor 2017-01-04 09:42:37 -08:00
• 9124acfb8f Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4" into nyc-mr2-dev-plus-aosp am: aba491e150 Tom Taylor 2016-12-07 03:06:40 +00:00
• cebf2d2fed Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4 am: 6866222775 Tom Taylor 2016-12-07 03:06:39 +00:00
• 07ac300933 Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5" into nyc-mr2-dev-plus-aosp am: ab3d4505b8 Tom Taylor 2016-12-07 03:06:22 +00:00
• 30c4aa86d7 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5 am: c1acc768f6 Tom Taylor 2016-12-07 03:06:21 +00:00
• 959501b7a8 Merge "resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e" into nyc-mr2-dev-plus-aosp am: 6f1cbaf08f Tom Taylor 2016-12-07 03:06:05 +00:00
• 611d8f76df resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e am: c2faf5d56b Tom Taylor 2016-12-07 03:06:04 +00:00
• 2e21662e13 resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 0c37f58fa0 am: d918dfbcd7 Tom Taylor 2016-12-07 03:05:55 +00:00
• aba491e150 Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4" into nyc-mr2-dev-plus-aosp Android Build Merger (Role) 2016-12-07 03:02:09 +00:00
• ab3d4505b8 Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5" into nyc-mr2-dev-plus-aosp Android Build Merger (Role) 2016-12-07 03:02:08 +00:00
• 6866222775 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4 Tom Taylor 2016-12-07 03:02:03 +00:00
• c1acc768f6 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5 Tom Taylor 2016-12-07 03:02:03 +00:00
• 6f1cbaf08f Merge "resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e" into nyc-mr2-dev-plus-aosp Android Build Merger (Role) 2016-12-07 03:02:00 +00:00
• d918dfbcd7 resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 0c37f58fa0 Tom Taylor 2016-12-07 03:01:55 +00:00
• c2faf5d56b resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e Tom Taylor 2016-12-07 03:01:55 +00:00
• 904b5cbec5 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e Tom Taylor 2016-12-07 02:58:04 +00:00
• 208a2979d4 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e Tom Taylor 2016-12-07 02:58:02 +00:00
• 0c37f58fa0 resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f Tom Taylor 2016-12-07 02:57:54 +00:00
• 713068d06e resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f Tom Taylor 2016-12-07 02:57:54 +00:00
• 4d1366300e Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 Tom Taylor 2016-12-07 02:54:04 +00:00
• 838049884f resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee Tom Taylor 2016-12-07 02:53:54 +00:00
• 28c5e61eb5 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 Tom Taylor 2016-12-07 02:49:34 +00:00
• 47feeee8ee resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 Tom Taylor 2016-12-07 02:49:24 +00:00
• 8166028e03 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb Tom Taylor 2016-12-07 02:46:00 +00:00
• 4d220d4777 resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 Tom Taylor 2016-12-07 02:45:53 +00:00
• 518c9798eb Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c Tom Taylor 2016-12-07 02:41:54 +00:00
• a43c5c5f18 resolve merge conflicts of eafd58a to nyc-dev Tom Taylor 2016-12-06 16:26:14 -08:00
• 44a2425fa2 Merge "32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: 55ebb66b11" into nyc-mr2-dev-plus-aosp am: 756f34d472 Tom Taylor 2016-12-06 22:46:47 +00:00
• 341bf114de 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: 55ebb66b11 am: 8588963d8a Tom Taylor 2016-12-06 22:46:46 +00:00
• 2ada4e4707 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: a9bec8503b am: 6d7bb21c8a Tom Taylor 2016-12-06 22:46:39 +00:00