)]}' { "log": [ { "commit": "b84a505b62d3d8d52f272e64a1a7f998aa69b8a7", "tree": "862c31415c02bb21836207af22228fbe140f68fc", "parents": [ "72265a8fc3bb47a537fb56d10ea05d8078e28cb5" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Tue Jan 10 22:05:08 2017 -0800" }, "committer": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Tue Jan 10 23:51:26 2017 -0800" }, "message": "Rename language+country resources to just language\n\nBug: 26496609\nTest: none\nChange-Id: I40b99a8728f1f324f4c1f8066a61c3d5f92b1ac6\n" }, { "commit": "72265a8fc3bb47a537fb56d10ea05d8078e28cb5", "tree": "2fc465d483822bb16b4293d2653be5ff4ab11a10", "parents": [ "59bb81a0e8ec4a13d92a4e25e087fea9561ae2d8", "4ef97cf6dd29bc19118773eb0a95066be63f79db" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Wed Jan 11 00:17:51 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 11 00:17:55 2017 +0000" }, "message": "Merge \"Merge \"Fix naming of key\" am: 0b74a1dabb am: c68c2f6885 am: 1d67d022fb am: 11765b3fcc -s ours\"" }, { "commit": "4ef97cf6dd29bc19118773eb0a95066be63f79db", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "2600bbe271e03373bd59862ca4f13c61603f90ef", "11765b3fcc776ca93eb9cf7b024a7c09b7d7555c" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Jan 11 00:16:43 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 11 00:16:43 2017 +0000" }, "message": "Merge \"Fix naming of key\" am: 0b74a1dabb am: c68c2f6885 am: 1d67d022fb\nam: 11765b3fcc -s ours\n\nChange-Id: Ica15c50f4cc0ec0905cf0f573bdcf0c3b032da68\n" }, { "commit": "59bb81a0e8ec4a13d92a4e25e087fea9561ae2d8", "tree": "2fc465d483822bb16b4293d2653be5ff4ab11a10", "parents": [ "917bb57021d8d325394bc47b687f4f06ff478228", "2600bbe271e03373bd59862ca4f13c61603f90ef" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Wed Jan 11 00:16:06 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 11 00:16:10 2017 +0000" }, "message": "Merge changes from topic \u0027am-7c32574535fe4d59a550a86c30095868\u0027\n\n* changes:\n Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am: 98d86fe2b7 am: c6d9f0fbce am: 367f70cca4 am: 6c852fb228\n Dynamically add the webview_zygote\u0027s preloaded APK to the zygote FD whitelist. am: 54e387ddbe am: 839a185b2e am: df781cc514 am: 15fe73846c\n Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am: 8225b7c951 am: 63a7fe6de8 am: 024793713f am: 4a27be1952 -s ours\n Zygote: Additional whitelisting for legacy devices. am: f701ba36b3 am: 7a69406767 am: 647986fd54 am: e34b213b30\n" }, { "commit": "2600bbe271e03373bd59862ca4f13c61603f90ef", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "b715c563e3e9af9a73cb38b228f770a01f8707da", "6c852fb22802ef8da44d2806fa0f17f08acd9542" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Wed Jan 11 00:14:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 11 00:14:22 2017 +0000" }, "message": "Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am: 98d86fe2b7 am: c6d9f0fbce am: 367f70cca4\nam: 6c852fb228\n\nChange-Id: Icb9cec440489f782092a1b7fbf1801bb6b8a03db\n" }, { "commit": "b715c563e3e9af9a73cb38b228f770a01f8707da", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "d7732919e762ba4917b38e73f373f31670baa53e", "15fe73846cb1a94599f98b458f7a4c052206b9ea" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Wed Jan 11 00:13:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 11 00:13:10 2017 +0000" }, "message": "Dynamically add the webview_zygote\u0027s preloaded APK to the zygote FD whitelist. am: 54e387ddbe am: 839a185b2e am: df781cc514\nam: 15fe73846c\n\nChange-Id: If94ee0ece8b08f748ac10aa9a0d64c5ec67e6059\n" }, { "commit": "d7732919e762ba4917b38e73f373f31670baa53e", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "ebb893410037ad9054273c3d1078c7bae254f64c", "4a27be19522ce5dcf4d35b90607cec09e68a5dd7" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Wed Jan 11 00:11:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 11 00:11:47 2017 +0000" }, "message": "Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am: 8225b7c951 am: 63a7fe6de8 am: 024793713f\nam: 4a27be1952 -s ours\n\nChange-Id: I2cd395598bcd4fb5c995f03eb22f62469c597450\n" }, { "commit": "917bb57021d8d325394bc47b687f4f06ff478228", "tree": "2fc465d483822bb16b4293d2653be5ff4ab11a10", "parents": [ "d2e7c2e0a1fb7323d5b378a50a934270739f4eea", "6c1ca280b3bf5646afd5f0ef57beceb52233c782" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 11 00:11:25 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 11 00:11:28 2017 +0000" }, "message": "Merge \"Move getActiveScorerPackage() to the score service.\"" }, { "commit": "ebb893410037ad9054273c3d1078c7bae254f64c", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "d2e7c2e0a1fb7323d5b378a50a934270739f4eea", "e34b213b30fd38ca6884b32b9680a7014f8b6d89" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jan 11 00:10:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 11 00:10:44 2017 +0000" }, "message": "Zygote: Additional whitelisting for legacy devices. am: f701ba36b3 am: 7a69406767 am: 647986fd54\nam: e34b213b30\n\nChange-Id: I351a6e43b1ef28e91d9bb9632f13641c2711277a\n" }, { "commit": "11765b3fcc776ca93eb9cf7b024a7c09b7d7555c", "tree": "42ed29356ae9b310b707eb5bc59138b8a7752b34", "parents": [ "6c852fb22802ef8da44d2806fa0f17f08acd9542", "1d67d022fb5f49ce88bae26d1175c1f391b025d6" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue Jan 10 23:55:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:55:55 2017 +0000" }, "message": "Merge \"Fix naming of key\" am: 0b74a1dabb am: c68c2f6885\nam: 1d67d022fb\n\nChange-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3\n" }, { "commit": "6c852fb22802ef8da44d2806fa0f17f08acd9542", "tree": "3bdcfc6a694266fef318eb00868499ea4eaa3e18", "parents": [ "15fe73846cb1a94599f98b458f7a4c052206b9ea", "367f70cca4cd7bd95c4e09508906a94b29f20a2d" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 23:53:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:53:40 2017 +0000" }, "message": "Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am: 98d86fe2b7 am: c6d9f0fbce\nam: 367f70cca4\n\nChange-Id: I039178a775f15d9a6e82ab481d15896e243759e9\n" }, { "commit": "15fe73846cb1a94599f98b458f7a4c052206b9ea", "tree": "3bdcfc6a694266fef318eb00868499ea4eaa3e18", "parents": [ "4a27be19522ce5dcf4d35b90607cec09e68a5dd7", "df781cc5147c07f1d28b78806b3578a2ff571497" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 23:52:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:52:13 2017 +0000" }, "message": "Dynamically add the webview_zygote\u0027s preloaded APK to the zygote FD whitelist. am: 54e387ddbe am: 839a185b2e\nam: df781cc514\n\nChange-Id: I869aaa330de7fb0de2d608a6cbf7a8974e9757ba\n" }, { "commit": "d2e7c2e0a1fb7323d5b378a50a934270739f4eea", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "1cef1541a8df8cbdb5af4f7d12c091001f785950", "75bcb014661f9e8b57f684403c9f424bab05a0e8" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 23:51:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:51:35 2017 +0000" }, "message": "Merge \"resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp am: ba33854fbc\nam: 75bcb01466\n\nChange-Id: I62a5c933c49bc7d3c1ee996b09b0255b1fc25d19\n" }, { "commit": "4a27be19522ce5dcf4d35b90607cec09e68a5dd7", "tree": "c2b4fd76657e9e74ff441d8fcde92bd007d99adc", "parents": [ "e34b213b30fd38ca6884b32b9680a7014f8b6d89", "024793713f9c0a715502e828ec4da3377ede3ac5" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 23:51:14 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:51:14 2017 +0000" }, "message": "Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am: 8225b7c951 am: 63a7fe6de8\nam: 024793713f\n\nChange-Id: If30588787332fbfcdf4573f976ec8ca086db8260\n" }, { "commit": "1cef1541a8df8cbdb5af4f7d12c091001f785950", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "460e9104d09cd15543ba28eb95b3869018b81733", "fb52b3700cf1d4e5b28206134ea651301c67bda3" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 23:50:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:50:28 2017 +0000" }, "message": "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp am: be3a8ad2ba\nam: fb52b3700c\n\nChange-Id: I7df690c4511898936c5a2b397034c108c29ebef2\n" }, { "commit": "e34b213b30fd38ca6884b32b9680a7014f8b6d89", "tree": "d68d14c78f4d1896a5d2fd5b62cfe19ad4dc888d", "parents": [ "75bcb014661f9e8b57f684403c9f424bab05a0e8", "647986fd54de07b4be085f85e9e1e53aa1d8e5ea" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 10 23:50:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:50:23 2017 +0000" }, "message": "Zygote: Additional whitelisting for legacy devices. am: f701ba36b3 am: 7a69406767\nam: 647986fd54\n\nChange-Id: I1c508f812298bc9ec6870a3e655129e630e536e5\n" }, { "commit": "1d67d022fb5f49ce88bae26d1175c1f391b025d6", "tree": "87dae19071cbd1c6cf2dd48546613bbe6737cdbb", "parents": [ "367f70cca4cd7bd95c4e09508906a94b29f20a2d", "c68c2f68854302d86e3f4aaba5edb8556b42d1df" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue Jan 10 23:44:43 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:44:43 2017 +0000" }, "message": "Merge \"Fix naming of key\" am: 0b74a1dabb\nam: c68c2f6885\n\nChange-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba\n" }, { "commit": "75bcb014661f9e8b57f684403c9f424bab05a0e8", "tree": "d68d14c78f4d1896a5d2fd5b62cfe19ad4dc888d", "parents": [ "fb52b3700cf1d4e5b28206134ea651301c67bda3", "ba33854fbce0f1fe262c76915c36a4a7bc01f3d6" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 23:42:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:42:19 2017 +0000" }, "message": "Merge \"resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp\nam: ba33854fbc\n\nChange-Id: I109dedc6bec6847b81a2a88b698938910a2715bf\n" }, { "commit": "fb52b3700cf1d4e5b28206134ea651301c67bda3", "tree": "d68d14c78f4d1896a5d2fd5b62cfe19ad4dc888d", "parents": [ "24d5a0bae29c7696624038ffc76bc3b3294e10c0", "be3a8ad2ba0eedb9d200121c97f98c3638857d22" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 23:42:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:42:12 2017 +0000" }, "message": "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp\nam: be3a8ad2ba\n\nChange-Id: I76970ff769a4cad2b3d702f0282515fb58defcbb\n" }, { "commit": "367f70cca4cd7bd95c4e09508906a94b29f20a2d", "tree": "6c64caf12f7f85731f2b5d269deab610d2ccd377", "parents": [ "df781cc5147c07f1d28b78806b3578a2ff571497", "c6d9f0fbcea6e8a208a498e798eba11848e2fbc9" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 23:41:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:41:13 2017 +0000" }, "message": "Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am: 98d86fe2b7\nam: c6d9f0fbce\n\nChange-Id: I0010cbf45a5e9fc10f86dbfbda510d34ba4b7429\n" }, { "commit": "df781cc5147c07f1d28b78806b3578a2ff571497", "tree": "6c64caf12f7f85731f2b5d269deab610d2ccd377", "parents": [ "024793713f9c0a715502e828ec4da3377ede3ac5", "839a185b2eca0c42a43cbba1f1a8ecf92bd015c2" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 23:40:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:40:15 2017 +0000" }, "message": "Dynamically add the webview_zygote\u0027s preloaded APK to the zygote FD whitelist. am: 54e387ddbe\nam: 839a185b2e\n\nChange-Id: I1e761ea737447b347f2542419d18d1f42b1b50db\n" }, { "commit": "024793713f9c0a715502e828ec4da3377ede3ac5", "tree": "4600de756d60701d5352582bf3911079f92f42f4", "parents": [ "647986fd54de07b4be085f85e9e1e53aa1d8e5ea", "63a7fe6de8c5e5bf3f4255484bc09e413c76e5a7" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 23:39:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:39:28 2017 +0000" }, "message": "Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am: 8225b7c951\nam: 63a7fe6de8\n\nChange-Id: I9148523bae8466e56cf00d7624c53c22318215f7\n" }, { "commit": "647986fd54de07b4be085f85e9e1e53aa1d8e5ea", "tree": "7a729aff94d1efa99d1e252ea2e84ed7146cfcd9", "parents": [ "ba33854fbce0f1fe262c76915c36a4a7bc01f3d6", "7a694067674962dbccfd085e72133e7fc71d5830" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 10 23:38:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 23:38:18 2017 +0000" }, "message": "Zygote: Additional whitelisting for legacy devices. am: f701ba36b3\nam: 7a69406767\n\nChange-Id: I932aa16137686cce2be00a13f32978df34857709\n" }, { "commit": "460e9104d09cd15543ba28eb95b3869018b81733", "tree": "5c5a22e7e943bb3eb97af749c69264146f24156b", "parents": [ "cfe182001f339696044b710811c169d80c28d075", "255461f676f09db9be3876c156d571f4e08981ee" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Tue Jan 10 23:37:14 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 23:37:19 2017 +0000" }, "message": "Merge \"Allow adding target activity via requestPinShortcut().\"" }, { "commit": "ba33854fbce0f1fe262c76915c36a4a7bc01f3d6", "tree": "7a729aff94d1efa99d1e252ea2e84ed7146cfcd9", "parents": [ "f41881b7fe7567fda79f25f528f05b2b630d2f0f", "be3a8ad2ba0eedb9d200121c97f98c3638857d22" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 23:34:41 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 23:34:45 2017 +0000" }, "message": "Merge \"resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp" }, { "commit": "be3a8ad2ba0eedb9d200121c97f98c3638857d22", "tree": "7a729aff94d1efa99d1e252ea2e84ed7146cfcd9", "parents": [ "cab27fbbf45e5788831db29fa6008bdb95a69899", "53726c0bbfafea124fa683801ce6911b0dfdf64c" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 15:12:18 2017 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 15:12:18 2017 -0800" }, "message": "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp\n\nChange-Id: Iddf65660f9ac1d66907c8a3d2a3d34d9f3f66d81\n" }, { "commit": "c68c2f68854302d86e3f4aaba5edb8556b42d1df", "tree": "d41d480c6f86c6e28ddcf3282da5f789eeea044f", "parents": [ "c6d9f0fbcea6e8a208a498e798eba11848e2fbc9", "0b74a1dabb4829e277fd64fe3d1893fe22f02a18" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue Jan 10 22:59:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:59:18 2017 +0000" }, "message": "Merge \"Fix naming of key\"\nam: 0b74a1dabb\n\nChange-Id: I8eaaee259d96c2c2da70828cd882a86ae6bde8f1\n" }, { "commit": "cfe182001f339696044b710811c169d80c28d075", "tree": "a1ac9c310755c6e3541783ca00496de4e454be64", "parents": [ "186de91ebaacfe5e2e7d6e9f3be77c221654ed11", "74ce1a0425138f1431f52807f82d3e8964f590df" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 22:55:57 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 22:56:01 2017 +0000" }, "message": "Merge \"add dark assets to sw900dp devices.\"" }, { "commit": "186de91ebaacfe5e2e7d6e9f3be77c221654ed11", "tree": "9046005c8ceacac1d03515427faf1762cc45aba3", "parents": [ "5df7f1ab6183d5abe50b1bfe00cc86eec23f8cf0", "24d5a0bae29c7696624038ffc76bc3b3294e10c0" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 22:54:24 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:54:24 2017 +0000" }, "message": "Merge \"Cleanup test method names.\" am: 8e9fd295c8 am: 361412ced4 am: f41881b7fe\nam: 24d5a0bae2 -s ours\n\nChange-Id: I663efcf7cb1367be5d17b417d8c7b35012cf1ce6\n" }, { "commit": "0b74a1dabb4829e277fd64fe3d1893fe22f02a18", "tree": "70354f296744c425babb4bec1a6492bc349d4d83", "parents": [ "98d86fe2b7042534f1cbbfc76515a68bd5250b5f", "7c4bfb28d113022acb8afea8f7f77736871b979c" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue Jan 10 22:51:49 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 10 22:51:50 2017 +0000" }, "message": "Merge \"Fix naming of key\"" }, { "commit": "24d5a0bae29c7696624038ffc76bc3b3294e10c0", "tree": "d68d14c78f4d1896a5d2fd5b62cfe19ad4dc888d", "parents": [ "a3c801bac4bbebcd8c6424dc011e45c7b410def9", "f41881b7fe7567fda79f25f528f05b2b630d2f0f" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 22:48:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:48:47 2017 +0000" }, "message": "Merge \"Cleanup test method names.\" am: 8e9fd295c8 am: 361412ced4\nam: f41881b7fe\n\nChange-Id: I779562d42a399beaa8df47050d68a6fc95f47fba\n" }, { "commit": "f41881b7fe7567fda79f25f528f05b2b630d2f0f", "tree": "7a729aff94d1efa99d1e252ea2e84ed7146cfcd9", "parents": [ "cab27fbbf45e5788831db29fa6008bdb95a69899", "361412ced421d7de600055b997e7fa26e1abb211" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 22:39:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:39:23 2017 +0000" }, "message": "Merge \"Cleanup test method names.\" am: 8e9fd295c8\nam: 361412ced4\n\nChange-Id: I160b077d4faff67a721e9557f7dae10682dc2d81\n" }, { "commit": "c6d9f0fbcea6e8a208a498e798eba11848e2fbc9", "tree": "2aed3dfe08ae9ec27ad74db1c6492c5c4128c525", "parents": [ "839a185b2eca0c42a43cbba1f1a8ecf92bd015c2", "98d86fe2b7042534f1cbbfc76515a68bd5250b5f" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 22:33:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:33:04 2017 +0000" }, "message": "Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc\nam: 98d86fe2b7\n\nChange-Id: If98bcf93212e84c0e01eb3281b729e1760762356\n" }, { "commit": "839a185b2eca0c42a43cbba1f1a8ecf92bd015c2", "tree": "2aed3dfe08ae9ec27ad74db1c6492c5c4128c525", "parents": [ "63a7fe6de8c5e5bf3f4255484bc09e413c76e5a7", "54e387ddbe6a0462bc8e9e15c7c7b3463adfcb24" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 22:33:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:33:00 2017 +0000" }, "message": "Dynamically add the webview_zygote\u0027s preloaded APK to the zygote FD whitelist.\nam: 54e387ddbe\n\nChange-Id: I7b4e809767e4cdd64da4094decc929504e1e93d8\n" }, { "commit": "63a7fe6de8c5e5bf3f4255484bc09e413c76e5a7", "tree": "762a90c43e8a60aa395e2d4ba9a5a5dd6441749d", "parents": [ "7a694067674962dbccfd085e72133e7fc71d5830", "8225b7c95185dfbfe67da105df4402430784393c" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Tue Jan 10 22:32:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:32:05 2017 +0000" }, "message": "Split core/jni/fd_utils-inl.h into a .h/.cpp pair.\nam: 8225b7c951\n\nChange-Id: Ic5a021e5851f158caddc7f58ad7098a070f6219a\n" }, { "commit": "7a694067674962dbccfd085e72133e7fc71d5830", "tree": "15305dc371cc6a42debc29ded874919c235c3c70", "parents": [ "53726c0bbfafea124fa683801ce6911b0dfdf64c", "f701ba36b343fd6df51fbf5945932612bc3108c1" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 10 22:30:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:30:41 2017 +0000" }, "message": "Zygote: Additional whitelisting for legacy devices.\nam: f701ba36b3\n\nChange-Id: Ic12fdc0261f258dcd1019290a057fef4fcedd0f3\n" }, { "commit": "53726c0bbfafea124fa683801ce6911b0dfdf64c", "tree": "86426dbcf8c992cf09c5129478a88b5ced0b6e9d", "parents": [ "361412ced421d7de600055b997e7fa26e1abb211", "0ff7ef60f504410cd9b704da31bcff80400a0019" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 10 22:29:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:29:55 2017 +0000" }, "message": "Zygote: Additional whitelists for runtime overlay / other static resources.\nam: 0ff7ef60f5\n\nChange-Id: Ia4ee03a2a8e801918306cacf5ff1f69401f3847d\n" }, { "commit": "361412ced421d7de600055b997e7fa26e1abb211", "tree": "60fc09228990df15c5721c30020bd15dba538c42", "parents": [ "f338ed34f99d7e90dce5d90ee5552cd546baca53", "8e9fd295c8bc6d73ce691ea83a07ed065c7d24f6" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 22:28:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 22:28:51 2017 +0000" }, "message": "Merge \"Cleanup test method names.\"\nam: 8e9fd295c8\n\nChange-Id: Idb000e2b6cd8b7ba2046d329e039f6b05424686e\n" }, { "commit": "98d86fe2b7042534f1cbbfc76515a68bd5250b5f", "tree": "7d79ab8db8cade56afa7c3bdedcf4d8effd8021a", "parents": [ "8e9fd295c8bc6d73ce691ea83a07ed065c7d24f6", "54e387ddbe6a0462bc8e9e15c7c7b3463adfcb24" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 22:21:01 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 10 22:21:01 2017 +0000" }, "message": "Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc\n\n* changes:\n Dynamically add the webview_zygote\u0027s preloaded APK to the zygote FD whitelist.\n Split core/jni/fd_utils-inl.h into a .h/.cpp pair.\n Zygote: Additional whitelisting for legacy devices.\n Zygote: Additional whitelists for runtime overlay / other static resources.\n" }, { "commit": "8e9fd295c8bc6d73ce691ea83a07ed065c7d24f6", "tree": "5be70e935052e81d074d9d3fc0144a0111127441", "parents": [ "f3b1881bb233f1d8335a30e5b75d51237f099072", "23f1fcd5ef2b2afd3b364cde00c4c5244eaaf6f5" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 22:18:56 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 10 22:18:57 2017 +0000" }, "message": "Merge \"Cleanup test method names.\"" }, { "commit": "5df7f1ab6183d5abe50b1bfe00cc86eec23f8cf0", "tree": "9046005c8ceacac1d03515427faf1762cc45aba3", "parents": [ "bbdcc9305a726c8549b950a3c32fa571a15aa541", "25cfa134835e3791bdb6572f5e25cf4599015678" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 22:16:15 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 22:16:19 2017 +0000" }, "message": "Merge \"Provide non-blocking SurfaceView draw notification path.\"" }, { "commit": "255461f676f09db9be3876c156d571f4e08981ee", "tree": "b3f4bcb90292a3ca5f7fbfe520c98c68d1401ce0", "parents": [ "a2b61657c4bfbc9d13cf1414c2eb7a1f99557d3e" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Tue Jan 10 11:47:25 2017 -0800" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Tue Jan 10 14:05:28 2017 -0800" }, "message": "Allow adding target activity via requestPinShortcut().\n\nAlso now ShortcutManager tries to fill in the main activity as the target\nactivity if the caller has one.\n\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests\nTest: Running: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutManagerTestCases\nTest: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutHostTestCases\n\nBug 34047091\n\nChange-Id: I2bf2b20e94a2384cfa6e6b7d40d56cfe96a94fd9\n" }, { "commit": "bbdcc9305a726c8549b950a3c32fa571a15aa541", "tree": "fa87ceed9664361d1e59db2b4a49edee06ebfa5d", "parents": [ "f5393c8a50c85f86e12d9a388fe3d4ced1f3eeb9", "4af561ff17b82a32580d3c1bd8b91be12f25b7fd" ], "author": { "name": "Michael Dooley", "email": "mdooley@google.com", "time": "Tue Jan 10 22:02:12 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 22:02:15 2017 +0000" }, "message": "Merge \"Adding extra key to indicate when the last emergency call was made.\"" }, { "commit": "f5393c8a50c85f86e12d9a388fe3d4ced1f3eeb9", "tree": "a499b77e8df7d8c0ea7776bc5c0f419e181d34ff", "parents": [ "5afac5cdd6484e3a982d310c273b4b50406a0215", "a3c801bac4bbebcd8c6424dc011e45c7b410def9" ], "author": { "name": "Tao Wu", "email": "lepton@google.com", "time": "Tue Jan 10 21:44:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 21:44:25 2017 +0000" }, "message": "Merge \"Remove unused variable.\" am: f3b1881bb2 am: f338ed34f9 am: cab27fbbf4\nam: a3c801bac4 -s ours\n\nChange-Id: I1f1a9817e73c4f1fa59605a5484a2a08017b008d\n" }, { "commit": "a3c801bac4bbebcd8c6424dc011e45c7b410def9", "tree": "881e727f26908a203a97fcfbdd26c29efdb8d904", "parents": [ "418f072a0ea3455dc0c7fd6c3d24a3dcbffe8e2c", "cab27fbbf45e5788831db29fa6008bdb95a69899" ], "author": { "name": "Tao Wu", "email": "lepton@google.com", "time": "Tue Jan 10 21:39:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 21:39:19 2017 +0000" }, "message": "Merge \"Remove unused variable.\" am: f3b1881bb2 am: f338ed34f9\nam: cab27fbbf4\n\nChange-Id: I454d6359029bdbffa5e124e31759f30d6aec5f76\n" }, { "commit": "cab27fbbf45e5788831db29fa6008bdb95a69899", "tree": "8c5ef62a5b50f26f7f005687dbfb863e0f3bb8c2", "parents": [ "669affdb8e70043e3ecb8274251f609cb529bbf0", "f338ed34f99d7e90dce5d90ee5552cd546baca53" ], "author": { "name": "Tao Wu", "email": "lepton@google.com", "time": "Tue Jan 10 21:34:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 21:34:20 2017 +0000" }, "message": "Merge \"Remove unused variable.\" am: f3b1881bb2\nam: f338ed34f9\n\nChange-Id: Ia2ab8632bfe5e5b4751bb89aad30c3c739112469\n" }, { "commit": "f338ed34f99d7e90dce5d90ee5552cd546baca53", "tree": "77eeeb100d6a9c8fcf6c3ee687e6c94738a2a853", "parents": [ "7beb2b75a92c22a6bfcc9caeece737e4ea0fd562", "f3b1881bb233f1d8335a30e5b75d51237f099072" ], "author": { "name": "Tao Wu", "email": "lepton@google.com", "time": "Tue Jan 10 21:29:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 21:29:16 2017 +0000" }, "message": "Merge \"Remove unused variable.\"\nam: f3b1881bb2\n\nChange-Id: I563647e4f5abc635ff3f67d7f0b658bdd1d92716\n" }, { "commit": "5afac5cdd6484e3a982d310c273b4b50406a0215", "tree": "a499b77e8df7d8c0ea7776bc5c0f419e181d34ff", "parents": [ "e961992ed313ea1c733500d9b66f1af5349b59b2", "134c9d3311debd96aa63510835d31465e97155e1" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 21:15:18 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 21:15:24 2017 +0000" }, "message": "Merge \"Moved isCallerActiveScorer() to the score service.\"" }, { "commit": "f3b1881bb233f1d8335a30e5b75d51237f099072", "tree": "920edea5aed004adf4042acea74ba08ac92c10e1", "parents": [ "6a9ad14172619b7d61a5119d7f95e613d890f603", "e68b7ca20c276c45b3a8713cdc4daa5238d13644" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 21:15:01 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 10 21:15:02 2017 +0000" }, "message": "Merge \"Remove unused variable.\"" }, { "commit": "6c1ca280b3bf5646afd5f0ef57beceb52233c782", "tree": "bcc06973cc8239987986be6fecc75f43dc2f8511", "parents": [ "134c9d3311debd96aa63510835d31465e97155e1" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 13:08:32 2017 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 13:08:32 2017 -0800" }, "message": "Move getActiveScorerPackage() to the score service.\n\nImplemented getActiveScorerPackage() in the NetworkScoreService to\nmake it more efficient (no need to query PM).\n\nTest: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest\nBug: 33781558\nChange-Id: I2144351c2c09cad30f80399069364f3572e38445\n" }, { "commit": "23f1fcd5ef2b2afd3b364cde00c4c5244eaaf6f5", "tree": "9f6a02fefaa068021ef13bd4dbb8311bce61e10a", "parents": [ "6a9ad14172619b7d61a5119d7f95e613d890f603" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 08:53:02 2017 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 13:00:32 2017 -0800" }, "message": "Cleanup test method names.\n\nRenamed some test methods to reflect the proper permission.\n\nTest: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest\nBug: 1764042\nChange-Id: Ia7db8826ad18c3b8f119aa063cb2c7b3793a9d17\nMerged-In: I5551ddcb411432c6aeb14c03d9a284aa68f1bd1b\n" }, { "commit": "4af561ff17b82a32580d3c1bd8b91be12f25b7fd", "tree": "6dcf9312ad8635fa5e174cf2538f7249d877bed6", "parents": [ "e961992ed313ea1c733500d9b66f1af5349b59b2" ], "author": { "name": "mike dooley", "email": "mdooley@google.com", "time": "Tue Dec 20 08:55:17 2016 -0800" }, "committer": { "name": "Michael Dooley", "email": "mdooley@google.com", "time": "Tue Jan 10 20:56:23 2017 +0000" }, "message": "Adding extra key to indicate when the last emergency call was made.\n\nThis can be used to determine if an incoming call is potentially\nan emergency callback.\n\nBug: 30952524\nTest: none\nChange-Id: I2d4ca8e6885c0314394b3a2ad389ad8115b79156\n" }, { "commit": "54e387ddbe6a0462bc8e9e15c7c7b3463adfcb24", "tree": "9c2e6a5f4bb8f2bb6b6de700f4ab63866881824c", "parents": [ "8225b7c95185dfbfe67da105df4402430784393c" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Fri Dec 02 17:27:50 2016 -0500" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 11:44:56 2017 -0800" }, "message": "Dynamically add the webview_zygote\u0027s preloaded APK to the zygote FD whitelist.\n\nThis refactors the whitelist to be a class, rather than just a static C array.\nThe whitelist can then be augmented dynamically when the package path is known\nin the webview_zygote.\n\nTest: m\nTest: sailfish boots\nTest: Enable Multi-process WebView in developer options, perform a search in GSA.\n\nBug: 21643067\nChange-Id: Ia1f2535c7275b42b309631b4fe7859c30cbf7309\n(cherry picked from commit 061ee3088a79ab0e07d37d1c0897d51422f29c4e)\n" }, { "commit": "8225b7c95185dfbfe67da105df4402430784393c", "tree": "5d61b2a82c457ad534070b697fb6ad5c622dff14", "parents": [ "f701ba36b343fd6df51fbf5945932612bc3108c1" ], "author": { "name": "Robert Sesek", "email": "rsesek@google.com", "time": "Fri Dec 16 14:02:31 2016 -0500" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 11:41:01 2017 -0800" }, "message": "Split core/jni/fd_utils-inl.h into a .h/.cpp pair.\n\n(cherry picked from commit 44afe8be8f654192dc436a9c4238a925c22b14bf)\n\nTest: m\nTest: sailfish boots\n\nChange-Id: I9ca93f31f6c20b702b2207333a9d56f6592630b0\n" }, { "commit": "f701ba36b343fd6df51fbf5945932612bc3108c1", "tree": "41f5390e280e61b10f04ee5ab02ebe2de9676256", "parents": [ "0ff7ef60f504410cd9b704da31bcff80400a0019" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Nov 07 19:59:29 2016 +0000" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 11:27:52 2017 -0800" }, "message": "Zygote: Additional whitelisting for legacy devices.\n\nOn M and below, we provide a blanket whitelist for all files under\n\"/vendor/zygote_whitelist\". This path is whitelisted purely to allow\nthis patch to be applied easily on legacy devices and configurations.\n\nNote that this does not amount to a loosening of our security policy\nbecause whitelisted files are reopened anyway.\n\n(cherry picked from commit 5e2f7c6229d7191183888d685b57a7d0a2835fce)\n\nBug: 32691930\nTest: manual\nChange-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99\n" }, { "commit": "e68b7ca20c276c45b3a8713cdc4daa5238d13644", "tree": "478c4fa5f8f70c4f0d549ecbaff85cc6e3d9c7c4", "parents": [ "866658261f4613e17ed6f39a74975ad0c9f40767" ], "author": { "name": "Tao Wu", "email": "lepton@google.com", "time": "Fri Nov 11 10:42:02 2016 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Jan 10 19:20:18 2017 +0000" }, "message": "Remove unused variable.\n\nCode search show nobody referenced it and aosp image still compiles after\nremove it.\n\nTest: make -j18 systemimage userdataimage ramdisk\n\nChange-Id: I3e37ea590610091b938296c999dceb3caf919906\nMerged-In: I3e37ea590610091b938296c999dceb3caf919906\nSigned-off-by: Tao Wu \u003clepton@google.com\u003e\n" }, { "commit": "0ff7ef60f504410cd9b704da31bcff80400a0019", "tree": "9c7e8ac4cdbe57389e175556798df5edaa58eefe", "parents": [ "6a9ad14172619b7d61a5119d7f95e613d890f603" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Sep 23 09:07:11 2016 +0100" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Jan 10 11:16:31 2017 -0800" }, "message": "Zygote: Additional whitelists for runtime overlay / other static resources.\n\nPartially cherry picked from commit 1c15c635785c64a.\n\nThese files are safe to reopen for the same reason that files in\n/system/framework are. They\u0027re regular files and will not change after\nthe first zygote fork.\n\n(cherry picked from commit 25cd01cc69fcad34756b00e52a79c0c54178f2e6)\n\nBug: 32618130\nTest: m\nChange-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f\n" }, { "commit": "e961992ed313ea1c733500d9b66f1af5349b59b2", "tree": "3d11dddf786bb32ef6ac658925a7966bbfcfd633", "parents": [ "d14cafc27255e0ed44665a0975a57c487b841ab1", "a50d58e22630cd651a815381639e70476991bdbf" ], "author": { "name": "Calin Juravle", "email": "calin@google.com", "time": "Tue Jan 10 18:58:03 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 18:58:06 2017 +0000" }, "message": "Merge \"Add an extra debug flag to BackgroundDexOptimizer\"" }, { "commit": "134c9d3311debd96aa63510835d31465e97155e1", "tree": "88d972988237777f565fded983f7b727c45110f5", "parents": [ "d14cafc27255e0ed44665a0975a57c487b841ab1" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Mon Jan 09 16:22:20 2017 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 10:52:56 2017 -0800" }, "message": "Moved isCallerActiveScorer() to the score service.\n\nImplemented isCallerActiveScorer() in the NetworkScoreService to make\nit more efficient (no need to query PM). Exposed the call as a new\ninternal API on NetworkScoreManager and deprecated the call on\nNetworkScorerAppManager.\n\nTest: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest\nBug: 33781558\nChange-Id: I0e2142af95b068d322343f7c9362ac53d46b545e\n" }, { "commit": "d14cafc27255e0ed44665a0975a57c487b841ab1", "tree": "f27de23e89b0e9dd033aafeffc263e31841af1eb", "parents": [ "558097a03bc4e8c40a9e82cf1264d7e741337c64", "f7fee94d75991f219ef28c1dda1bbe3f86017dfe" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Jan 10 18:36:26 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 18:36:30 2017 +0000" }, "message": "Merge \"Remove unused variable.\"" }, { "commit": "558097a03bc4e8c40a9e82cf1264d7e741337c64", "tree": "7575fdca2ba9b25885083dd5a792ae66ceb8c3f6", "parents": [ "6f225cae06a49bf2c34716b3418d7b64d0feb232", "06d1fd7077c1dd4da3b8c1d6e02931c5b76b3670" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 18:35:40 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 18:35:44 2017 +0000" }, "message": "Merge \"Cleanup test method names.\"" }, { "commit": "6f225cae06a49bf2c34716b3418d7b64d0feb232", "tree": "887162dcec829ab79b23132bd3fd0f537d5ba359", "parents": [ "fb5b1477819f7ae07bd110f8e134e56c6d72d53f", "3f06c6de08b9e0c7ab1fd1774783ca355e994f06" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Tue Jan 10 18:15:53 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 18:15:57 2017 +0000" }, "message": "Merge \"Revert \"Revert \"Fast-path for ViewGroup#invalidateChild, invalidate tests\"\"\"" }, { "commit": "fb5b1477819f7ae07bd110f8e134e56c6d72d53f", "tree": "83334d7e7c4ca30cf963fb71538ea345fc940726", "parents": [ "d07305a2bf9e76ff8f3f38cd088de352802c5673", "cca6d05fb4f37fa6e68e9ab2236a8cfda516f1a7" ], "author": { "name": "Mark Renouf", "email": "mrenouf@google.com", "time": "Tue Jan 10 17:53:08 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 17:53:11 2017 +0000" }, "message": "Merge \"Update javadoc for startActivityForResult(Intent, int, Bundle)\"" }, { "commit": "d07305a2bf9e76ff8f3f38cd088de352802c5673", "tree": "6b430f23289ddd12087ff18605d246deb5d940f8", "parents": [ "7d63b2a9dd360ef276317694f7051dad6e72bcf8", "1ba3ac92818701c89e031e40215d89cad38cbc34" ], "author": { "name": "Justin Klaassen", "email": "justinklaassen@google.com", "time": "Tue Jan 10 17:43:05 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 17:43:09 2017 +0000" }, "message": "Merge \"Add AlarmClock#SHOW_TIMERS\"" }, { "commit": "7d63b2a9dd360ef276317694f7051dad6e72bcf8", "tree": "4b944c87dd1b0ef3a6d1f92c5a7ea47668cbfa94", "parents": [ "9f7fd6c734527b33e40a9f0d8199c961d52694bb", "c3bd7b78d80370f21102bae155b05f2567f2a31d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 17:32:52 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 17:32:57 2017 +0000" }, "message": "Merge \"Additional unit tests for isProvisioningAllowed\"" }, { "commit": "06d1fd7077c1dd4da3b8c1d6e02931c5b76b3670", "tree": "517e2192ae9334bdb5bf5e1240f22e12bbc83c7e", "parents": [ "9f7fd6c734527b33e40a9f0d8199c961d52694bb" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 08:53:02 2017 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Jan 10 09:07:09 2017 -0800" }, "message": "Cleanup test method names.\n\nRenamed some test methods to reflect the proper permission.\n\nTest: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest\nBug: 1764042\nChange-Id: I5551ddcb411432c6aeb14c03d9a284aa68f1bd1b\n" }, { "commit": "9f7fd6c734527b33e40a9f0d8199c961d52694bb", "tree": "50c01c90b2910a26a61c420a61b83ea1758d2906", "parents": [ "955da4804e7cc940e7aed93cb2ab1774e5f1cb03", "03533715295154f0bb66f84b7c25832d21156805" ], "author": { "name": "Geoffrey Pitsch", "email": "gpitsch@google.com", "time": "Tue Jan 10 16:20:10 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 16:20:13 2017 +0000" }, "message": "Merge \"API improvements for creating NotificationChannels\"" }, { "commit": "1ba3ac92818701c89e031e40215d89cad38cbc34", "tree": "db0699e173fee2a1db7aa151cdb8aed0d8800c09", "parents": [ "955da4804e7cc940e7aed93cb2ab1774e5f1cb03" ], "author": { "name": "Sean Stout", "email": "sstout@google.com", "time": "Mon Dec 05 14:05:03 2016 -0800" }, "committer": { "name": "Justin Klaassen", "email": "justinklaassen@google.com", "time": "Tue Jan 10 16:16:29 2017 +0000" }, "message": "Add AlarmClock#SHOW_TIMERS\n\nTest: run cts -m CtsContentTestCases\nBug: 31228110\nChange-Id: Ia291a890b83996d6edf7b75afa52e44557a9117b\n" }, { "commit": "c3bd7b78d80370f21102bae155b05f2567f2a31d", "tree": "d52617a594650569ffeff256310ba212a61168ee", "parents": [ "0a57fbd93cb6beadbf1709ddfc3d094a38c0799f" ], "author": { "name": "Nicolas Prevot", "email": "nprevot@google.com", "time": "Tue Jan 10 11:32:43 2017 +0000" }, "committer": { "name": "Nicolas Prevot", "email": "nprevot@google.com", "time": "Tue Jan 10 16:08:47 2017 +0000" }, "message": "Additional unit tests for isProvisioningAllowed\n\nTest it with disallow add / remove managed profile user restrictions.\n\nBUG:32629873\nTest: adb shell am instrument -e class\ncom.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner\n\nChange-Id: Ic6b01c2b0ed9081204801a6c5719b0fd25eafbba\n" }, { "commit": "955da4804e7cc940e7aed93cb2ab1774e5f1cb03", "tree": "c798d39cbde68dc98beee42c6df1627fd116ca54", "parents": [ "0a57fbd93cb6beadbf1709ddfc3d094a38c0799f", "834abec877ab33ce189d1c7ff53edcc64fe468f0" ], "author": { "name": "Bryce Lee", "email": "brycelee@google.com", "time": "Tue Jan 10 15:24:20 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 15:24:24 2017 +0000" }, "message": "Merge \"Amend logic for sending power hint on activity start.\"" }, { "commit": "0a57fbd93cb6beadbf1709ddfc3d094a38c0799f", "tree": "e956e1bfea266772a3e0fa70c53c72b308a47a46", "parents": [ "b125b88387ded70643e34e407e265a3ef0a411de", "418f072a0ea3455dc0c7fd6c3d24a3dcbffe8e2c" ], "author": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Tue Jan 10 14:14:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 14:14:32 2017 +0000" }, "message": "Merge \"Re-Add VPN-\"Settings\" button to QSFooter dialog\" into nyc-mr2-dev am: a7c6324340\nam: 418f072a0e\n\nChange-Id: I0c765230dbcc82b05a488ad2f5e66cf20ef90551\n" }, { "commit": "b125b88387ded70643e34e407e265a3ef0a411de", "tree": "e956e1bfea266772a3e0fa70c53c72b308a47a46", "parents": [ "2fa6c35647f3874b56d81a08735588c127366f28", "a524313118e7eec9038a7ea3e80e35bde4dddf5a" ], "author": { "name": "phweiss", "email": "phweiss@google.com", "time": "Tue Jan 10 14:13:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 14:13:18 2017 +0000" }, "message": "Re-Add VPN-\"Settings\" button to QSFooter dialog am: d361b181e5\nam: a524313118\n\nChange-Id: Ifde3ad732f22e220f04d9e64de455070e42cb440\n" }, { "commit": "2fa6c35647f3874b56d81a08735588c127366f28", "tree": "e956e1bfea266772a3e0fa70c53c72b308a47a46", "parents": [ "54402aab14deb9f21b0a9b451f80113ab9821b04", "0a5882980b0fbfbd4c18920de647adc138042526" ], "author": { "name": "phweiss", "email": "phweiss@google.com", "time": "Tue Jan 10 14:12:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 14:12:06 2017 +0000" }, "message": "Dismiss network logging notification when disabling logging am: 971236480c\nam: 0a5882980b\n\nChange-Id: I37be8068c3c77b6ca45b1f4f831fcc7562630458\n" }, { "commit": "418f072a0ea3455dc0c7fd6c3d24a3dcbffe8e2c", "tree": "0a25dc7f9dd8bf7770ad1df1df948d3be15cfc1b", "parents": [ "a524313118e7eec9038a7ea3e80e35bde4dddf5a", "a7c632434069a549f917c64720204f192f693ff0" ], "author": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Tue Jan 10 14:03:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 14:03:04 2017 +0000" }, "message": "Merge \"Re-Add VPN-\"Settings\" button to QSFooter dialog\" into nyc-mr2-dev\nam: a7c6324340\n\nChange-Id: Ia0265e6401a9c3bee533383988755da02e6a251c\n" }, { "commit": "a524313118e7eec9038a7ea3e80e35bde4dddf5a", "tree": "0a25dc7f9dd8bf7770ad1df1df948d3be15cfc1b", "parents": [ "0a5882980b0fbfbd4c18920de647adc138042526", "d361b181e5e49ea93753d32dab047efba531a4b8" ], "author": { "name": "phweiss", "email": "phweiss@google.com", "time": "Tue Jan 10 14:02:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 14:02:57 2017 +0000" }, "message": "Re-Add VPN-\"Settings\" button to QSFooter dialog\nam: d361b181e5\n\nChange-Id: Iee7dcfbb4a2bcaaddada850918185fc4d9cc47c1\n" }, { "commit": "0a5882980b0fbfbd4c18920de647adc138042526", "tree": "7b370614ad35a0d72011d81c6307bc3a13aaa2e1", "parents": [ "aa92e65ff896e7c42d074cfe65c1297644239644", "971236480c2a95db94b073877c8595c274d28893" ], "author": { "name": "phweiss", "email": "phweiss@google.com", "time": "Tue Jan 10 14:01:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 14:01:42 2017 +0000" }, "message": "Dismiss network logging notification when disabling logging\nam: 971236480c\n\nChange-Id: I7f47b6318ef8c4b792115c2721a0d56dc6cdbfd3\n" }, { "commit": "a7c632434069a549f917c64720204f192f693ff0", "tree": "1026ff77ea4d57b37a74c1212cec29c7d3d16f55", "parents": [ "971236480c2a95db94b073877c8595c274d28893", "d361b181e5e49ea93753d32dab047efba531a4b8" ], "author": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Tue Jan 10 13:54:25 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 13:54:28 2017 +0000" }, "message": "Merge \"Re-Add VPN-\"Settings\" button to QSFooter dialog\" into nyc-mr2-dev" }, { "commit": "54402aab14deb9f21b0a9b451f80113ab9821b04", "tree": "e956e1bfea266772a3e0fa70c53c72b308a47a46", "parents": [ "b5d57e1048ea9ca7610fca70b68933c5ed8d6382", "85a63bc1a06870b5a86926b0bce94a2bf559e3f0" ], "author": { "name": "Andrew Scull", "email": "ascull@google.com", "time": "Tue Jan 10 13:20:46 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 13:20:49 2017 +0000" }, "message": "Merge \"Evict CE key on request and when work mode is turned off.\"" }, { "commit": "b5d57e1048ea9ca7610fca70b68933c5ed8d6382", "tree": "0f4341bfcc8ab9b9bfe5e0d427d36bbb347e3675", "parents": [ "18315230f641ab0704485465d39a31e235fc3268", "5de23c5eb4b56fdaa377fb7c098176441a17c7b4" ], "author": { "name": "Ben Weiss", "email": "benweiss@google.com", "time": "Tue Jan 10 11:10:31 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 11:10:33 2017 +0000" }, "message": "Merge \"Make ArcMotion material spec compliant\"" }, { "commit": "d361b181e5e49ea93753d32dab047efba531a4b8", "tree": "17b492406a28c422fd8865fc49ffbc9363852af7", "parents": [ "3faf3467e3d3fe962e76468a052b03b2a17b48f3" ], "author": { "name": "phweiss", "email": "phweiss@google.com", "time": "Mon Jan 09 15:56:00 2017 +0100" }, "committer": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Tue Jan 10 10:16:35 2017 +0000" }, "message": "Re-Add VPN-\"Settings\" button to QSFooter dialog\n\nButton was removed during a redesign of the dialog in the case\nof active device owner. However, when no DO is set, the button should\nstill be there.\n\nAlso, when VPN configuration is restricted, do not show the button, and\nalso do not show the link that is visible in the DO-version of the dialog.\n\nBug:34156553\nBug:29748723\nTest: manual\n\nChange-Id: I177afdc94dc396754fc7703e4316edaa7ce104cd\n(cherry picked from commit a99a3f70e2a07e7c85d25fed1881d1a6ef70a93c)\n" }, { "commit": "971236480c2a95db94b073877c8595c274d28893", "tree": "8a4455dd401500abac9b36258faae31bb7d3824b", "parents": [ "3faf3467e3d3fe962e76468a052b03b2a17b48f3" ], "author": { "name": "phweiss", "email": "phweiss@google.com", "time": "Mon Jan 09 17:43:14 2017 +0100" }, "committer": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Tue Jan 10 10:16:12 2017 +0000" }, "message": "Dismiss network logging notification when disabling logging\n\nBug:34116213\nBug:29748723\nTest: CTSVerifier in a separate CL.\n\nChange-Id: Ie652505ff57665f626712c67837577833f1595d6\n(cherry picked from commit 82ed31c1efeb98acba60d79d1fc0a291b1440dc2)\n" }, { "commit": "18315230f641ab0704485465d39a31e235fc3268", "tree": "709172700c240429103958b073ff3074cb43e778", "parents": [ "89a2cf74ba8443dd27af44dd1cc59a62ab363fb9", "82ed31c1efeb98acba60d79d1fc0a291b1440dc2" ], "author": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Tue Jan 10 10:15:23 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 10:15:26 2017 +0000" }, "message": "Merge \"Dismiss network logging notification when disabling logging\"" }, { "commit": "89a2cf74ba8443dd27af44dd1cc59a62ab363fb9", "tree": "c43e9c9cba746c17748d40adeb7a3e2f65810adb", "parents": [ "1b85c7e0d920f6447a1c9eb472856b9a12579687", "a99a3f70e2a07e7c85d25fed1881d1a6ef70a93c" ], "author": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Tue Jan 10 10:14:34 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 10:14:37 2017 +0000" }, "message": "Merge \"Re-Add VPN-\"Settings\" button to QSFooter dialog\"" }, { "commit": "1b85c7e0d920f6447a1c9eb472856b9a12579687", "tree": "555c10d29a248f9aac205ef4b7d65ec6913e0c88", "parents": [ "14b629e1f85bbf46e79971604156069c08fb3c1c", "aa92e65ff896e7c42d074cfe65c1297644239644" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:31:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:31:47 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev am: 3faf3467e3 -s ours\nam: aa92e65ff8 -s ours\n\nChange-Id: I46d8d8d89b23c3b162708112e706ead5562e6d82\n" }, { "commit": "14b629e1f85bbf46e79971604156069c08fb3c1c", "tree": "555c10d29a248f9aac205ef4b7d65ec6913e0c88", "parents": [ "b544c3647ebda50b081c1918273e33e07e2f54e9", "ae3786a8b9012655564efa61489c661a049f7cf3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:30:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:30:39 2017 +0000" }, "message": "Import translations. DO NOT MERGE am: 5ef189ddeb -s ours\nam: ae3786a8b9 -s ours\n\nChange-Id: I510a6275a8ca73be7d49aeb14ee27a295e8a635c\n" }, { "commit": "b544c3647ebda50b081c1918273e33e07e2f54e9", "tree": "555c10d29a248f9aac205ef4b7d65ec6913e0c88", "parents": [ "91dc6c2d793f65e52de79321a9fd89aaca344922", "856bfc2019ad74f108ef6d55524f75324b16428b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:29:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:29:29 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev am: 0ffe43ecd7 -s ours\nam: 856bfc2019 -s ours\n\nChange-Id: Id6431aeb418700ed20636fe6f369195d1501efb7\n" }, { "commit": "91dc6c2d793f65e52de79321a9fd89aaca344922", "tree": "555c10d29a248f9aac205ef4b7d65ec6913e0c88", "parents": [ "ee0d06eb8e1edb243a6ce06e786b4a78c1ca6aef", "f685b49b28a09cb10e07e9713c77fb63ed87251e" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:28:30 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:28:30 2017 +0000" }, "message": "Import translations. DO NOT MERGE am: 4fcf5b1813 -s ours\nam: f685b49b28 -s ours\n\nChange-Id: Ie333b72281a1f4aaf6d186a09f25e34d8a9c42f7\n" }, { "commit": "aa92e65ff896e7c42d074cfe65c1297644239644", "tree": "5bf152ea9d612c3d2fb2d2369013f7a23caecd07", "parents": [ "ae3786a8b9012655564efa61489c661a049f7cf3", "3faf3467e3d3fe962e76468a052b03b2a17b48f3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:21:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:21:29 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev\nam: 3faf3467e3 -s ours\n\nChange-Id: Ibbdb7922b216c0c3ffeeccd1b2a02a8a8841ac47\n" }, { "commit": "ae3786a8b9012655564efa61489c661a049f7cf3", "tree": "5bf152ea9d612c3d2fb2d2369013f7a23caecd07", "parents": [ "856bfc2019ad74f108ef6d55524f75324b16428b", "5ef189ddeb908bfb535845bba872134743d6fb45" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:21:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:21:23 2017 +0000" }, "message": "Import translations. DO NOT MERGE\nam: 5ef189ddeb -s ours\n\nChange-Id: I34abef81d61a5b9f566bbb2877271ed7ea72a977\n" }, { "commit": "ee0d06eb8e1edb243a6ce06e786b4a78c1ca6aef", "tree": "555c10d29a248f9aac205ef4b7d65ec6913e0c88", "parents": [ "b316e22a0a7f814c21da0c0aa2fc9fd65d2ac863", "a8f7f312fce97323ea84065ff9e9bfe64f4a0fd2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 07:19:39 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 07:19:43 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\"" }, { "commit": "856bfc2019ad74f108ef6d55524f75324b16428b", "tree": "5bf152ea9d612c3d2fb2d2369013f7a23caecd07", "parents": [ "f685b49b28a09cb10e07e9713c77fb63ed87251e", "0ffe43ecd7f95f4fb08cde9de1892f99d96ee864" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:19:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:19:28 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev\nam: 0ffe43ecd7 -s ours\n\nChange-Id: I06a438a8cf7de8effc3d62912c1bf8761ad08d59\n" }, { "commit": "f685b49b28a09cb10e07e9713c77fb63ed87251e", "tree": "5bf152ea9d612c3d2fb2d2369013f7a23caecd07", "parents": [ "91b91b7f86d890ef4c0210b1dfb78e2aa3a7dc10", "4fcf5b1813a6c3103c6d4247156bc5ac5273cb0a" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 10 07:19:24 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 07:19:24 2017 +0000" }, "message": "Import translations. DO NOT MERGE\nam: 4fcf5b1813 -s ours\n\nChange-Id: Ie1da6f2d65250668afc630ccbfa61b7531c2721e\n" }, { "commit": "b316e22a0a7f814c21da0c0aa2fc9fd65d2ac863", "tree": "04a2a7de98749e741e56d30a5a128170c5525287", "parents": [ "e135bced9e3bc711c2fa85610a585c025a46bb34", "8966f0da329ab88d2fc317244056beb628e0707a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 07:14:25 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 07:14:28 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\"" }, { "commit": "e135bced9e3bc711c2fa85610a585c025a46bb34", "tree": "0951e8aa5fc4ed85b01d07a1feb50ead34614128", "parents": [ "8dedad31f7fa604028ee6d28963bcc564e76c467", "918c1fe649875b7f280984ef00dd0021b4faaa1e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 07:13:37 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 07:13:41 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\"" }, { "commit": "3faf3467e3d3fe962e76468a052b03b2a17b48f3", "tree": "d31e2c204a87dd030897b0eceaea7ed2a8976d35", "parents": [ "0ffe43ecd7f95f4fb08cde9de1892f99d96ee864", "5ef189ddeb908bfb535845bba872134743d6fb45" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 07:12:54 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 07:12:57 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "0ffe43ecd7f95f4fb08cde9de1892f99d96ee864", "tree": "6dba071e87018fd1e0d36319fd1460f5dcdebd25", "parents": [ "4ebbea26cc5a17e738d81ae35a7abedf4c4ea279", "4fcf5b1813a6c3103c6d4247156bc5ac5273cb0a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 10 07:12:11 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 10 07:12:15 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "8dedad31f7fa604028ee6d28963bcc564e76c467", "tree": "56b0761b6cc37c6e56b639358edde3d7efb6db00", "parents": [ "bd439dcef072fd9a853a6bc9055cfa347ad7c969" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jan 09 18:21:21 2017 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jan 09 22:30:58 2017 -0700" }, "message": "Wire up storage stats API to installd.\n\nNow that installd has the implementation details we need, we can wire\nup the public APIs to use them.\n\nShuffle APIs around a bit so that StorageStats can be reused for both\nUID and UserHandle results, and rename StorageSummary to\nExternalStorageStats. Provide getTotalBytes() and getFreeBytes() as\nfirst-class methods so we can answer those questions quickly without\npaying the cost of measuring external storage details.\n\nCurrent costs on a typical device with a test account after flushing\ndentry caches:\n\nqueryStatsForUid() manual: 6922ms\nqueryStatsForUid() quota: 525ms\n\nqueryStatsForUser() manual: 1686ms\nqueryStatsForUser() quota: 113ms\n\nqueryExternalStatsForUser() manual: 42ms\nqueryExternalStatsForUser() quota: 2ms\n\nFor verification purposes, a new \"fw.verify_storage\" system property\ncan be set to compute both manual and quota statistics, and log any\ndiscrepancies.\n\nTest: builds, boots\nBug: 27948817, 32206268\nChange-Id: I4ea3df3372a7379aa8cf4c20c44120c8f0702c15\n" }, { "commit": "bd439dcef072fd9a853a6bc9055cfa347ad7c969", "tree": "0d1e4245fbe5487549b740edd1cc1a08ce312a45", "parents": [ "8ee008023bd1e2be4f52eed5807460778e890063", "91b91b7f86d890ef4c0210b1dfb78e2aa3a7dc10" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jan 10 04:52:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 04:52:50 2017 +0000" }, "message": "Merge \"Methods to calculate user and external disk usage.\" am: 6a9ad14172 am: 7beb2b75a9 am: 669affdb8e\nam: 91b91b7f86\n\nChange-Id: I7859db9f53560ad602bb26f37854bdfc02f15d09\n" }, { "commit": "91b91b7f86d890ef4c0210b1dfb78e2aa3a7dc10", "tree": "5bf152ea9d612c3d2fb2d2369013f7a23caecd07", "parents": [ "cfc07d4b2be8c93204b4f224ca3bc44f6329bee2", "669affdb8e70043e3ecb8274251f609cb529bbf0" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jan 10 04:47:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 04:47:47 2017 +0000" }, "message": "Merge \"Methods to calculate user and external disk usage.\" am: 6a9ad14172 am: 7beb2b75a9\nam: 669affdb8e\n\nChange-Id: I698dd15a397f16dd2358729362860443f7e81a33\n" }, { "commit": "669affdb8e70043e3ecb8274251f609cb529bbf0", "tree": "f03f7ed965ac9e9c5105eed6d7db4251eb43bf03", "parents": [ "43818c45a46480504f1a96ba60d7d58981e16c49", "7beb2b75a92c22a6bfcc9caeece737e4ea0fd562" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jan 10 04:42:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 10 04:42:52 2017 +0000" }, "message": "Merge \"Methods to calculate user and external disk usage.\" am: 6a9ad14172\nam: 7beb2b75a9\n\nChange-Id: I236eb3357b597cac26f5234a72551a471919a411\n" } ], "next": "7beb2b75a92c22a6bfcc9caeece737e4ea0fd562" }