Commit Graph
15 Commits
Author SHA1 Message Date
Android Build Merger (Role) 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 2016-12-07 03:02:09 +00:00
Android Build Merger (Role) 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 2016-12-07 03:02:08 +00:00
Android Build Merger (Role) 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 2016-12-07 03:02:00 +00:00
Android Build Merger (Role) 756f34d472 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 2016-12-06 22:43:14 +00:00
Android Build Merger (Role) 6b96f314a3 Merge "Bump targetSdkVersion to 24 am: f1210c127a am: 4e106215ed" into nyc-mr1-dev-plus-aosp 2016-06-03 01:14:44 +00:00
Android Build Merger (Role) d935ffe467 Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp 2016-05-16 18:21:28 +00:00
Android Build Merger (Role) d67bcb8597 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: 722c058dcc" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:06 +00:00
Android Build Merger (Role) 2672c4df38 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: b5fcc65e0d" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:05 +00:00
Android Build Merger (Role) d5c6997677 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 9cd2bdf010" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:02 +00:00
Android Build Merger (Role) f921d2f265 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 50357f8877" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:01 +00:00
Android Build Merger (Role) a4a666c991 Merge "Separate work and personal contacts search result am: 9045160771 am: 47037f9fef" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:50 +00:00
Android Build Merger (Role) ce8c016b14 Merge "Separate work and personal contacts search result am: 9045160771 am: 0ecb6b9a9b" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:46 +00:00
Android Build Merger (Role) 2b7f72f705 Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: f302d0cd2f" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:43 +00:00
Android Build Merger (Role) 62eb09d89e Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: 3a1468db12" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:41 +00:00
Android Build Merger (Role) 9b8c9555e6 Merge "Add isAtLeastN in OsUtil am: 0a85b81c9f am: 0e2ee3d3e6" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:40 +00:00