)]}' { "log": [ { "commit": "aa4ff2efecb1aa03b6a6843bf8a4c19b885db4fc", "tree": "a3929732d3a97a2911f5375bca277202273bd037", "parents": [ "29a9d27d3c9224a7709a41096d7a958c8177ac19", "eb822cecdb128cb0a00f361b87b8378d5664a458" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Jul 05 16:22:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jul 05 16:22:17 2014 +0000" }, "message": "am eb822cec: Merge \"Typo fix in permission string\"\n\n* commit \u0027eb822cecdb128cb0a00f361b87b8378d5664a458\u0027:\n Typo fix in permission string\n" }, { "commit": "29a9d27d3c9224a7709a41096d7a958c8177ac19", "tree": "8cffb3ee3ec902502b5663237ce8b764d7909fa8", "parents": [ "5ae312fb5b601d2c60e197f94c6a292700776140", "358a3f716850e96716b766c63d50d3425a4c9ed7" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jul 04 08:49:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jul 04 08:49:02 2014 +0000" }, "message": "am 358a3f71: Merge \"fix AudioTrack and AudioRecord JNI\"\n\n* commit \u0027358a3f716850e96716b766c63d50d3425a4c9ed7\u0027:\n fix AudioTrack and AudioRecord JNI\n" }, { "commit": "5ae312fb5b601d2c60e197f94c6a292700776140", "tree": "7eadf9ee96c48af04204dcbfcb0a300b022337a0", "parents": [ "c542745e23fe9d2e71c1f607d66f5570f585133d", "759e0d6a7a258dbc34a38a7db320827eb9144487" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jul 04 08:48:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jul 04 08:48:58 2014 +0000" }, "message": "am 759e0d6a: Merge \"Fix LocalePicker locale filtering.\"\n\n* commit \u0027759e0d6a7a258dbc34a38a7db320827eb9144487\u0027:\n Fix LocalePicker locale filtering.\n" }, { "commit": "759e0d6a7a258dbc34a38a7db320827eb9144487", "tree": "a4e8766fed2818bfeabd43480897d66440281ec4", "parents": [ "a6e9dd3f9a2d966faf2d1710d2189127b968dc52", "80b574199c5d06132acbcf640ec81f45f0d76ce3" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jul 04 08:23:08 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 04 08:02:36 2014 +0000" }, "message": "Merge \"Fix LocalePicker locale filtering.\"" }, { "commit": "80b574199c5d06132acbcf640ec81f45f0d76ce3", "tree": "452c319f6227fcd456deadbd1cb75acac1b096f9", "parents": [ "104da1e495cbed81e7ebe66b80344bf916b02391" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jul 03 13:26:07 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jul 03 13:31:42 2014 +0100" }, "message": "Fix LocalePicker locale filtering.\n\nThis was broken by commit b27c137087ee92674 which\nremoved a badly phrased check. Prior to that commit,\nthere was a check that excluded locales whose toString()\nlength was not 5.\n\nThis change reinstates that check in a less roundabout\nway, by excluding BCP-47 tags that don\u0027t have a country\nsubtag.\n\nbug: 16038949\n\nChange-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f\n" }, { "commit": "c542745e23fe9d2e71c1f607d66f5570f585133d", "tree": "cdc1b10f30122b006026e9ba7438e73c038f26f1", "parents": [ "e2840977d37e4d19425d448b54895536e43a2989", "a6e9dd3f9a2d966faf2d1710d2189127b968dc52" ], "author": { "name": "Brian Duff", "email": "bduff@google.com", "time": "Thu Jul 03 06:45:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jul 03 06:45:04 2014 +0000" }, "message": "am a6e9dd3f: Merge \"Fix a typo in NumberPicker javadoc.\"\n\n* commit \u0027a6e9dd3f9a2d966faf2d1710d2189127b968dc52\u0027:\n Fix a typo in NumberPicker javadoc.\n" }, { "commit": "eb822cecdb128cb0a00f361b87b8378d5664a458", "tree": "8b0ef3473252341721a5dfa7ed290dbc895b2e64", "parents": [ "358a3f716850e96716b766c63d50d3425a4c9ed7", "98a3a8a080f2dae97d416ac9ead872312befcc42" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Jul 05 16:18:31 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 03 01:32:01 2014 +0000" }, "message": "Merge \"Typo fix in permission string\"" }, { "commit": "358a3f716850e96716b766c63d50d3425a4c9ed7", "tree": "571005cd9c5f6d1cfd487a1c89cbb5222343c299", "parents": [ "759e0d6a7a258dbc34a38a7db320827eb9144487", "90d0b9e1bb4f1e4dac77388f79f6e53e8619751d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jul 04 08:41:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 02 20:52:49 2014 +0000" }, "message": "Merge \"fix AudioTrack and AudioRecord JNI\"" }, { "commit": "90d0b9e1bb4f1e4dac77388f79f6e53e8619751d", "tree": "61cf25418cae8b8c55ecb135e1e86ad30ae02a8a", "parents": [ "104da1e495cbed81e7ebe66b80344bf916b02391" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Apr 30 11:59:21 2014 -0700" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jul 04 09:37:28 2014 +0100" }, "message": "fix AudioTrack and AudioRecord JNI\n\nAudioTrack and AudioRecord JNI should not cast\njshortArray to jbyteArray. This appeared to work with Dalvik\nbut causes data corruption with ART.\n\n(cherry picked from commit 9d02848e902d04417df616354db3a18c03e639b7)\n\nChange-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86\n" }, { "commit": "a6e9dd3f9a2d966faf2d1710d2189127b968dc52", "tree": "15288651c6267c37eac50e58253036f8582012ca", "parents": [ "6e84f8c1b9c72ab6e1eb189358292237dbe1efe8", "0db4c3e0ed0e9a85f11db41285b9adb000c3f211" ], "author": { "name": "Brian Duff", "email": "bduff@google.com", "time": "Thu Jul 03 06:05:07 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 02 20:51:20 2014 +0000" }, "message": "Merge \"Fix a typo in NumberPicker javadoc.\"" }, { "commit": "e2840977d37e4d19425d448b54895536e43a2989", "tree": "460dccb83c5164e46194e4989070186fafb383f6", "parents": [ "39e4f590787246ce35b995c0c0ce37b676a05e0c", "6e84f8c1b9c72ab6e1eb189358292237dbe1efe8" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 12:12:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 02 12:12:18 2014 +0000" }, "message": "am 6e84f8c1: Merge \"Fix native crashes when APKs can\\\u0027t be opened.\"\n\n* commit \u00276e84f8c1b9c72ab6e1eb189358292237dbe1efe8\u0027:\n Fix native crashes when APKs can\u0027t be opened.\n" }, { "commit": "39e4f590787246ce35b995c0c0ce37b676a05e0c", "tree": "0bdb06fc9b27e9aa284f4700b46571d442324f9f", "parents": [ "94171212431a45346e40fd97bbe72422e71f04be", "f56399f6ab492c8c32b7ff9a8deeb2547f17f6da" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 10:00:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 02 10:00:09 2014 +0000" }, "message": "am f56399f6: Merge \"Fall back to \"tl\" if \"fil\" is absent.\"\n\n* commit \u0027f56399f6ab492c8c32b7ff9a8deeb2547f17f6da\u0027:\n Fall back to \"tl\" if \"fil\" is absent.\n" }, { "commit": "94171212431a45346e40fd97bbe72422e71f04be", "tree": "0ee8b715ca2c7a055a19807f4f10932a9905868e", "parents": [ "d62196cfeffe5e4d725b5388fca57a18c154a44b", "104da1e495cbed81e7ebe66b80344bf916b02391" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 08:49:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 02 08:49:08 2014 +0000" }, "message": "am 104da1e4: Merge \"Fix broken assumptions in LocalePicker.\"\n\n* commit \u0027104da1e495cbed81e7ebe66b80344bf916b02391\u0027:\n Fix broken assumptions in LocalePicker.\n" }, { "commit": "d62196cfeffe5e4d725b5388fca57a18c154a44b", "tree": "1422485fcfaccc62182e74f231613e43d4e8982b", "parents": [ "8922ddbab1e394a59f957e8598fbbf88357e7838", "3fa99ec77ee52164575375c7709923c94d9693a6" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 08:49:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 02 08:49:04 2014 +0000" }, "message": "am 3fa99ec7: Merge \"Remove bogus 2 char limit for locales and countries.\"\n\n* commit \u00273fa99ec77ee52164575375c7709923c94d9693a6\u0027:\n Remove bogus 2 char limit for locales and countries.\n" }, { "commit": "8922ddbab1e394a59f957e8598fbbf88357e7838", "tree": "65dd5a5e43d276f88e2a1951793646d2e37a1b8d", "parents": [ "d172419e9a36f61af8c98d316ec2625e1f1304f6", "a6e06889fce7fbf2049f421daef02b8986736f77" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Jul 01 22:32:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 01 22:32:01 2014 +0000" }, "message": "am a6e06889: Merge \"Add profiler type options\"\n\n* commit \u0027a6e06889fce7fbf2049f421daef02b8986736f77\u0027:\n Add profiler type options\n" }, { "commit": "d172419e9a36f61af8c98d316ec2625e1f1304f6", "tree": "2671c1d72d2a0a24f9557a7b3251c39b20052f5d", "parents": [ "899c15ef2053f0cebfeda90b5211e80310e6f278", "9b1a7d4570dd692cf86c385dfcdf057ad966fa57" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Jul 01 21:13:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 01 21:13:12 2014 +0000" }, "message": "am 9b1a7d45: Merge \"Allow different SELinux policies for third party apps.\"\n\n* commit \u00279b1a7d4570dd692cf86c385dfcdf057ad966fa57\u0027:\n Allow different SELinux policies for third party apps.\n" }, { "commit": "9b1a7d4570dd692cf86c385dfcdf057ad966fa57", "tree": "4aa55b8cf7b73510623f7a517b3873efdd9ff2a9", "parents": [ "db816cef0dd1f1988fbcf3c70a66f9c4acf73358", "83b54ecab73912a16d783f0d03c2aada378173a7" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Jul 01 21:09:28 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 01 19:16:01 2014 +0000" }, "message": "Merge \"Allow different SELinux policies for third party apps.\"" }, { "commit": "83b54ecab73912a16d783f0d03c2aada378173a7", "tree": "4aa55b8cf7b73510623f7a517b3873efdd9ff2a9", "parents": [ "db816cef0dd1f1988fbcf3c70a66f9c4acf73358" ], "author": { "name": "Robert Craig", "email": "rpcraig@tycho.ncsc.mil", "time": "Tue Jul 01 13:53:11 2014 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Jul 01 13:53:11 2014 -0700" }, "message": "Allow different SELinux policies for third party apps.\n\nPrior support forced all third party apps\nto be resolved against the default stanza\nof the mac_permissions.xml file when assigning\nseinfo labels. This meant that all third party\napps, in effect, were untrusted regardless of\ncert and therefore received the same selinux domain.\nThis also had the unfortunate side effect of forcing\ncertain third party apps into the wrong domains\nbecause of shared userid requests among apps.\n\nThis patch removes that restriction and instead\nallows all apps, regardless of location, to be\nmatched against the full mac_permissions.xml\npolicy file. This then allows all apps signed\nwith known good certs to receive the same selinux\ndomains of other apps with whom they share trust.\n\nChange-Id: Iba569c046135c0e81140faf6296c5da26a243037\nSigned-off-by: rpcraig \u003crpcraig@tycho.ncsc.mil\u003e\n" }, { "commit": "899c15ef2053f0cebfeda90b5211e80310e6f278", "tree": "71a5106c7c3bd926eaf68315845d061f71289314", "parents": [ "7f319c47c8f5e947638eb1e5e73789ff83123bba", "db816cef0dd1f1988fbcf3c70a66f9c4acf73358" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jul 01 18:15:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 01 18:15:28 2014 +0000" }, "message": "am db816cef: Merge \"Make sure we clean up\"\n\n* commit \u0027db816cef0dd1f1988fbcf3c70a66f9c4acf73358\u0027:\n Make sure we clean up\n" }, { "commit": "104da1e495cbed81e7ebe66b80344bf916b02391", "tree": "115860c2a92e1c6be14180c789af633a037f2557", "parents": [ "3fa99ec77ee52164575375c7709923c94d9693a6", "b27c137087ee926746b43b1abd08fb360ede671b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 08:09:01 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 01 17:57:26 2014 +0000" }, "message": "Merge \"Fix broken assumptions in LocalePicker.\"" }, { "commit": "3fa99ec77ee52164575375c7709923c94d9693a6", "tree": "04fbc1acbfe1dccac82ae6b57dbdbd2eacf7e046", "parents": [ "a6e06889fce7fbf2049f421daef02b8986736f77", "37151b5032c381391440019a76022ff8dd8196d0" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 08:08:36 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 01 17:52:00 2014 +0000" }, "message": "Merge \"Remove bogus 2 char limit for locales and countries.\"" }, { "commit": "6e84f8c1b9c72ab6e1eb189358292237dbe1efe8", "tree": "f307ab06ca675cd992113b3cc79fd771d4cb5fd0", "parents": [ "f56399f6ab492c8c32b7ff9a8deeb2547f17f6da", "ec4516470d7ce6e47769591d678c838bd3f6f388" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 12:07:57 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 01 17:48:27 2014 +0000" }, "message": "Merge \"Fix native crashes when APKs can\u0027t be opened.\"" }, { "commit": "f56399f6ab492c8c32b7ff9a8deeb2547f17f6da", "tree": "02bbd706da907540982427ac29dd0cbd44589782", "parents": [ "104da1e495cbed81e7ebe66b80344bf916b02391", "e4345dbd2a892f38e62269d94e5ee7002d121bed" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 09:54:25 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 01 17:48:27 2014 +0000" }, "message": "Merge \"Fall back to \"tl\" if \"fil\" is absent.\"" }, { "commit": "e4345dbd2a892f38e62269d94e5ee7002d121bed", "tree": "02bbd706da907540982427ac29dd0cbd44589782", "parents": [ "104da1e495cbed81e7ebe66b80344bf916b02391" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jun 26 16:01:28 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jul 02 10:53:43 2014 +0100" }, "message": "Fall back to \"tl\" if \"fil\" is absent.\n\nFor JB-MR1, there was a hack that used \"tl\" where\nwe really meant \"fil\" because ICU didn\u0027t have localizations\nfor \"fil\". This has now been fixed, and we now support 3 letter\nlanguage codes for AAPT so we can use \"fil\" where required.\n\nFor the benefit of apps that need to target older platforms,\nwe fall back to \"tl\" if the app has assets for \"tl\" and the\nresource locale is \"fil\".\n\nSee bugs 7291355, 7207176 and 8049507 for more context.\n\nChange-Id: I1ac8502525f99b40f9091d5efd2df33518d47a41\n" }, { "commit": "db816cef0dd1f1988fbcf3c70a66f9c4acf73358", "tree": "f48753c4ff047b184e3d2656f7bc3b3ab366478d", "parents": [ "1dc550fa7333257a130d71866be37181f8ee553b", "f3fd18d1b4cb44bb31a5b4fba26136f6f4fc37ad" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jul 01 18:10:37 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 01 14:59:07 2014 +0000" }, "message": "Merge \"Make sure we clean up\"" }, { "commit": "a6e06889fce7fbf2049f421daef02b8986736f77", "tree": "7bff86ec966382d6f41c4fd3faa6b9b91a0f9b66", "parents": [ "9b1a7d4570dd692cf86c385dfcdf057ad966fa57", "54fc18b925d0dbb0a5c9a1b21956e23b4eaaf31d" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Jul 01 22:25:58 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 01 14:58:13 2014 +0000" }, "message": "Merge \"Add profiler type options\"" }, { "commit": "37151b5032c381391440019a76022ff8dd8196d0", "tree": "139256bd20e5d84f8e503d11b3a96d0ec01f8f50", "parents": [ "7165bd6d7496159b426f072bdf13adfffc917a24" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jul 01 12:44:51 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jul 01 13:50:18 2014 +0100" }, "message": "Remove bogus 2 char limit for locales and countries.\n\nLocale settings are persisted to system properties\nand not to system settings, so the values read here\nare used pretty much everywhere.\n\nbug: 15873165\nbug: 10090157\n\nChange-Id: Ie7cda166439112c615afbd38253cf4fbb5791242\n" }, { "commit": "b27c137087ee926746b43b1abd08fb360ede671b", "tree": "d4ebcfe0db17e1588d8b18bed0797272a44eb989", "parents": [ "7165bd6d7496159b426f072bdf13adfffc917a24" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jul 01 10:56:20 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jul 01 11:12:24 2014 +0100" }, "message": "Fix broken assumptions in LocalePicker.\n\nThis code assumed that the locale is always 5 chars in\nlength and was of the form xx-YY. This is not necessarily\ntrue. The language can be 3 letters in length and the locale\nmight have a script and variant.\n\nAlso cleans up several nasty pieces of code and eliminates\nunnecessary array copies and improves readability by using\nidiomatic java.\n\nbug: 15873165\nbug: 10090157\n\nChange-Id: Iab1cfd7b78e5772b1245654f2153caf63a96033d\n" }, { "commit": "7f319c47c8f5e947638eb1e5e73789ff83123bba", "tree": "e1ca4e1e2b095cf5d7eab736c6333219d6a4fc32", "parents": [ "89e4c715e01f4a2da31a92788547282d699752bf", "1dc550fa7333257a130d71866be37181f8ee553b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jul 01 09:22:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 01 09:22:10 2014 +0000" }, "message": "am 1dc550fa: Merge \"Fix packing of values at offset 16.\"\n\n* commit \u00271dc550fa7333257a130d71866be37181f8ee553b\u0027:\n Fix packing of values at offset 16.\n" }, { "commit": "ec4516470d7ce6e47769591d678c838bd3f6f388", "tree": "adb78edeb1cfadea99ef8fe598f9c2498fd46825", "parents": [ "7165bd6d7496159b426f072bdf13adfffc917a24" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jun 12 17:19:43 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jun 30 17:14:29 2014 +0100" }, "message": "Fix native crashes when APKs can\u0027t be opened.\n\nThere was lax / incomplete error checking around the\nconstruction of Apk handles. This change changes the ApkHandle\nAPI and makes it throw IOException if the zipfile couldn\u0027t\nbe opened.\n\nAdditionally :\n- Fix a resource leak in DefaultContainerService\n- Report errors correctly during package moves.\n\nbug: 15563874\nChange-Id: Ic71a10709eb82b8f53405bbfb2320e80aa96b771\n" }, { "commit": "1dc550fa7333257a130d71866be37181f8ee553b", "tree": "f60365e0cd6f2b4f2b508d2b3ed11099338827d8", "parents": [ "7165bd6d7496159b426f072bdf13adfffc917a24", "b2975916224caecfc2fbb84e71ebd625ce6eeb1c" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jul 01 09:17:41 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 26 21:28:22 2014 +0000" }, "message": "Merge \"Fix packing of values at offset 16.\"" }, { "commit": "b2975916224caecfc2fbb84e71ebd625ce6eeb1c", "tree": "f60365e0cd6f2b4f2b508d2b3ed11099338827d8", "parents": [ "7165bd6d7496159b426f072bdf13adfffc917a24" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jun 30 15:59:39 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jun 30 16:20:27 2014 +0100" }, "message": "Fix packing of values at offset 16.\n\nOur bitmask for setting the highest bit to 0 for\n0b11100000 (0xef) instead of 0b01111111 (0x7f) so\nwe would end up setting bit 5 of each offset to\nzero. Fix this and expand test coverage by adding\na fake language (tgp) that has this bit set in both\nits bytes.\n\nThis issue was discovered while adding CTS tests for\n\"tgl\".\n\nChange-Id: Ibb6de03000951c907c252049771039ab7466187a\n" }, { "commit": "89e4c715e01f4a2da31a92788547282d699752bf", "tree": "f69069426eb5f13718cbc533d7aa53b2e048d613", "parents": [ "6d38cec12baa98fc50abd033eddd359a66843efa", "7165bd6d7496159b426f072bdf13adfffc917a24" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Jun 26 00:20:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 26 00:20:26 2014 +0000" }, "message": "am 7165bd6d: Merge \"Add check and throw for failed Intrinsic init.\"\n\n* commit \u00277165bd6d7496159b426f072bdf13adfffc917a24\u0027:\n Add check and throw for failed Intrinsic init.\n" }, { "commit": "6d38cec12baa98fc50abd033eddd359a66843efa", "tree": "dc9996dc86586684d87835e9f3a1943f301b84af", "parents": [ "b20b0629c2ea6a8e1f7bebd0791dd21e545a4605", "924ed1fae19ba70b5c6267b977ae8c72b63fe99a" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Jun 25 20:44:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 25 20:44:09 2014 +0000" }, "message": "am 924ed1fa: Merge \"Switch from size_t -\u003e uint32_t for dimensions array.\"\n\n* commit \u0027924ed1fae19ba70b5c6267b977ae8c72b63fe99a\u0027:\n Switch from size_t -\u003e uint32_t for dimensions array.\n" }, { "commit": "7165bd6d7496159b426f072bdf13adfffc917a24", "tree": "66b9fb16f5b934dd9c7a03aa90c67c672669e821", "parents": [ "924ed1fae19ba70b5c6267b977ae8c72b63fe99a", "1c8da1cccedc7194cc02edbdf26249bc3550195c" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Jun 26 00:13:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 25 17:35:00 2014 +0000" }, "message": "Merge \"Add check and throw for failed Intrinsic init.\"" }, { "commit": "54fc18b925d0dbb0a5c9a1b21956e23b4eaaf31d", "tree": "30acbf0900caa3d3c5e9e95e6997a4e79e7b0f0f", "parents": [ "71dfc7e9accc1ca3cda52bdf475b03fa2a334e78" ], "author": { "name": "Wei Jin", "email": "wejin@google.com", "time": "Mon Jun 09 16:29:54 2014 -0700" }, "committer": { "name": "Wei Jin", "email": "wejin@google.com", "time": "Tue Jun 24 12:16:55 2014 -0700" }, "message": "Add profiler type options\n\nThis is related to the CL that adds a new type of profile data.\n\nChange-Id: I3e4e502da8e1b0dd9b32ddcbc5d11eca0d1ba2e5\n" }, { "commit": "b20b0629c2ea6a8e1f7bebd0791dd21e545a4605", "tree": "fb7dd78d71055871457a269084c95ab59ab8476a", "parents": [ "22a32d883794a7a96ff5ffb4830ea59065b3ebda", "71dfc7e9accc1ca3cda52bdf475b03fa2a334e78" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 24 14:21:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 24 14:21:14 2014 +0000" }, "message": "am 71dfc7e9: Merge \"Memory leak in parsePackage\"\n\n* commit \u002771dfc7e9accc1ca3cda52bdf475b03fa2a334e78\u0027:\n Memory leak in parsePackage\n" }, { "commit": "22a32d883794a7a96ff5ffb4830ea59065b3ebda", "tree": "0dcefe17d3234494c79f60c0ec2803c7e746d894", "parents": [ "c141ae547e9b295ce9013591a6fbb902b0e40073", "2a0f9e6a523abc28bdbc249010f5ddd184a27730" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 24 12:14:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 24 12:14:12 2014 +0000" }, "message": "am 2a0f9e6a: Merge \"Explicitly list out the list of cache subdirs to prune.\"\n\n* commit \u00272a0f9e6a523abc28bdbc249010f5ddd184a27730\u0027:\n Explicitly list out the list of cache subdirs to prune.\n" }, { "commit": "c141ae547e9b295ce9013591a6fbb902b0e40073", "tree": "70c49d284d77615d744dbde5c2ca767391d85ca5", "parents": [ "db3bcfb8f7c1f148bc89eea663ba5aa6fc0ece2f", "989ab6d38d77c0a1f7dc5e648e1950410d5d01d4" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 24 10:08:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 24 10:08:52 2014 +0000" }, "message": "am 989ab6d3: Merge \"Update javadoc for android.os.Bundle.\"\n\n* commit \u0027989ab6d38d77c0a1f7dc5e648e1950410d5d01d4\u0027:\n Update javadoc for android.os.Bundle.\n" }, { "commit": "924ed1fae19ba70b5c6267b977ae8c72b63fe99a", "tree": "d382f70716dc7f3c2dde5f0f61ad3331e66a0dcc", "parents": [ "71dfc7e9accc1ca3cda52bdf475b03fa2a334e78", "bc5d3eeedcbdff2e8331a6792902c6992db9bd31" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Jun 25 20:33:39 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 24 07:39:41 2014 +0000" }, "message": "Merge \"Switch from size_t -\u003e uint32_t for dimensions array.\"" }, { "commit": "bc5d3eeedcbdff2e8331a6792902c6992db9bd31", "tree": "d382f70716dc7f3c2dde5f0f61ad3331e66a0dcc", "parents": [ "71dfc7e9accc1ca3cda52bdf475b03fa2a334e78" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Jun 25 00:03:39 2014 -0700" }, "committer": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Jun 25 00:03:39 2014 -0700" }, "message": "Switch from size_t -\u003e uint32_t for dimensions array.\n\nChange-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c\n" }, { "commit": "db3bcfb8f7c1f148bc89eea663ba5aa6fc0ece2f", "tree": "19faac7aaa8f2ebb3e8fb4ec1d3dc187bdc505b6", "parents": [ "a77d0ef49e8c4b53e1cd794c0739584914bd6eda", "44023a4f20a38ed892a6181765337635d77b1de8" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Jun 24 06:53:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 24 06:53:18 2014 +0000" }, "message": "am 44023a4f: Merge \"We need to update mPos when we copy a FieldPacker via its data[] member.\"\n\n* commit \u002744023a4f20a38ed892a6181765337635d77b1de8\u0027:\n We need to update mPos when we copy a FieldPacker via its data[] member.\n" }, { "commit": "2a0f9e6a523abc28bdbc249010f5ddd184a27730", "tree": "cac974d59922fb80a3c094d7c56509c2256270ef", "parents": [ "989ab6d38d77c0a1f7dc5e648e1950410d5d01d4", "8df5bd08c2ec7e492dc442bc57157a56f65572aa" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 24 12:07:45 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 24 06:33:30 2014 +0000" }, "message": "Merge \"Explicitly list out the list of cache subdirs to prune.\"" }, { "commit": "71dfc7e9accc1ca3cda52bdf475b03fa2a334e78", "tree": "4364fd85bd976ee1456792b346069c1a0b889e27", "parents": [ "2a0f9e6a523abc28bdbc249010f5ddd184a27730", "5f7ce10c937abf7da6d547ae91bda495dfbc414d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 24 14:16:04 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 24 06:22:45 2014 +0000" }, "message": "Merge \"Memory leak in parsePackage\"" }, { "commit": "989ab6d38d77c0a1f7dc5e648e1950410d5d01d4", "tree": "7938bf40dea6e193480a0087e2cf08d47edabb45", "parents": [ "44023a4f20a38ed892a6181765337635d77b1de8", "ca2197b0457b1626b95a053d835ceaca43ac0286" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 24 10:03:08 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 24 06:22:45 2014 +0000" }, "message": "Merge \"Update javadoc for android.os.Bundle.\"" }, { "commit": "44023a4f20a38ed892a6181765337635d77b1de8", "tree": "7c44c85bfead92c41506b1f3648c81c7c77a1827", "parents": [ "0b57289678a4dc82fefa4894901af1be7f5cc3c6", "fcb3161e57705ee294ce6733c1a488454f314f58" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Jun 24 00:57:44 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 24 00:37:45 2014 +0000" }, "message": "Merge \"We need to update mPos when we copy a FieldPacker via its data[] member.\"" }, { "commit": "fcb3161e57705ee294ce6733c1a488454f314f58", "tree": "350c4f4346a8db8dfb49c008c842aaed853e01ce", "parents": [ "d24f557798d04bdd50f2a45e48b70b009a205b4a" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Mon Jun 23 17:35:04 2014 -0700" }, "committer": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Mon Jun 23 17:35:04 2014 -0700" }, "message": "We need to update mPos when we copy a FieldPacker via its data[] member.\n\nBug: 15756600\n\nThis change also adds a TODO/FIXME related to subAlign() and our tracking\nmechanism for it. We need to further investigate how to make subAlign() work\nproperly if a user copies their FieldPacker.\n\nChange-Id: I861e529abd11e378f7c73b510d7f418b940fe480\n" }, { "commit": "1c8da1cccedc7194cc02edbdf26249bc3550195c", "tree": "93cfad277aadcf6936ea7898023f80d498d9de36", "parents": [ "0b57289678a4dc82fefa4894901af1be7f5cc3c6" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Jun 23 15:15:08 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Jun 23 15:15:08 2014 -0700" }, "message": "Add check and throw for failed Intrinsic init.\n\nChange-Id: Icd53b3edd8e887d3692e5815dc0c38cd68b7aeb1\n" }, { "commit": "a77d0ef49e8c4b53e1cd794c0739584914bd6eda", "tree": "6db827d51a0bf0a91984d9f1b9b8519f64a4a0cc", "parents": [ "c4d37f58a1b5405812eaf96b4bd3a051d86884eb", "0b57289678a4dc82fefa4894901af1be7f5cc3c6" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Jun 23 22:02:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 23 22:02:12 2014 +0000" }, "message": "am 0b572896: (-s ours) Merge \"DO NOT MERGE refactor wifi p2p\\\u0027s startDhcpServer function\"\n\n* commit \u00270b57289678a4dc82fefa4894901af1be7f5cc3c6\u0027:\n DO NOT MERGE refactor wifi p2p\u0027s startDhcpServer function\n" }, { "commit": "0b57289678a4dc82fefa4894901af1be7f5cc3c6", "tree": "6393348a4a7c604907a247d70c8acebbd2acf0d9", "parents": [ "0eee8ac275927264f766bb18023365e83d4bfe5a", "78c8e7c8bfd816a2466f858ff26ab12ea7a2e510" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Jun 23 21:56:52 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 23 21:56:07 2014 +0000" }, "message": "Merge \"DO NOT MERGE refactor wifi p2p\u0027s startDhcpServer function\"" }, { "commit": "c4d37f58a1b5405812eaf96b4bd3a051d86884eb", "tree": "6db827d51a0bf0a91984d9f1b9b8519f64a4a0cc", "parents": [ "3e8368350e4098a5a5bd88fc2cb623f58c012ba2", "0eee8ac275927264f766bb18023365e83d4bfe5a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Jun 23 21:45:30 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 23 21:45:30 2014 +0000" }, "message": "am 0eee8ac2: Merge \"Fix thumbnail bug\"\n\n* commit \u00270eee8ac275927264f766bb18023365e83d4bfe5a\u0027:\n Fix thumbnail bug\n" }, { "commit": "78c8e7c8bfd816a2466f858ff26ab12ea7a2e510", "tree": "19451469855533ecbb9fa866a72e7646090d8ec3", "parents": [ "a06f5fa6563f7fc08b7bb2305f61bf649add0b5a" ], "author": { "name": "Jianzheng Zhou", "email": "jianzheng.zhou@freescale.com", "time": "Sat Feb 08 12:43:07 2014 +0800" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Jun 23 21:02:45 2014 +0000" }, "message": "DO NOT MERGE refactor wifi p2p\u0027s startDhcpServer function\n\nAdd getTetheredDhcpRanges() interface and call it before calling\nmNwService.startTethering() to update dhcp ranges. This will allow p2p app\nto run well concurrently with other tethering app(e.g. usb tethering).\n\nChange-Id: I5e8ffeb5d2d396f48b897cd9396f133e25ecca57\nSigned-off-by: Jianzheng Zhou \u003cjianzheng.zhou@freescale.com\u003e" }, { "commit": "3e8368350e4098a5a5bd88fc2cb623f58c012ba2", "tree": "4866a77f08fabb99f1624b8dd06826497006c6dc", "parents": [ "1b98ccf275d93197c1aa746d5c492a57cd62be7f", "a06f5fa6563f7fc08b7bb2305f61bf649add0b5a" ], "author": { "name": "Calin Juravle", "email": "calin@google.com", "time": "Mon Jun 23 17:26:29 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 23 17:26:29 2014 +0000" }, "message": "am a06f5fa6: Merge \"Fix the initialization of some profile properties\"\n\n* commit \u0027a06f5fa6563f7fc08b7bb2305f61bf649add0b5a\u0027:\n Fix the initialization of some profile properties\n" }, { "commit": "1b98ccf275d93197c1aa746d5c492a57cd62be7f", "tree": "b630a928e6d9564b3a369ad07e5751ef8a68dc8e", "parents": [ "a2121e497c2e82676b4bf5dc35b0015c38ddc5ab", "0924ef6592c3172db6ae1f3d92f845951f901486" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Mon Jun 23 15:43:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 23 15:43:40 2014 +0000" }, "message": "am 0924ef65: Merge \"Treat missing package usage data as a separate case\"\n\n* commit \u00270924ef6592c3172db6ae1f3d92f845951f901486\u0027:\n Treat missing package usage data as a separate case\n" }, { "commit": "a2121e497c2e82676b4bf5dc35b0015c38ddc5ab", "tree": "6ec2089bf03dd7bcfc21e027063ac8ee5990f5d8", "parents": [ "a642a9ea3b2288b431ecb284b94a4657ae62889d", "5957d6a889d9c9e46d260d915b9ffa66a763dd23" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jun 23 14:52:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 23 14:52:41 2014 +0000" }, "message": "am 5957d6a8: Merge \"Fix frontOfTask assignment.\"\n\n* commit \u00275957d6a889d9c9e46d260d915b9ffa66a763dd23\u0027:\n Fix frontOfTask assignment.\n" }, { "commit": "0eee8ac275927264f766bb18023365e83d4bfe5a", "tree": "2455eb2aceef9e0b6efca9c1c8c2af94ced81102", "parents": [ "a06f5fa6563f7fc08b7bb2305f61bf649add0b5a", "b416af13e748aca18a220a9f4a5232306af9c830" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Jun 23 21:41:32 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 23 14:50:49 2014 +0000" }, "message": "Merge \"Fix thumbnail bug\"" }, { "commit": "5f7ce10c937abf7da6d547ae91bda495dfbc414d", "tree": "5b3435aca8d2ec60519464a3a99b71dc5d969249", "parents": [ "1a3908e95926acd8add3858be571fe23fa9d047a" ], "author": { "name": "Henrik Baard", "email": "henrik.baard@sonymobile.com", "time": "Wed Jun 18 13:34:01 2014 +0200" }, "committer": { "name": "Henrik Baard", "email": "henrik.baard@sonymobile.com", "time": "Mon Jun 23 14:03:46 2014 +0200" }, "message": "Memory leak in parsePackage\n\nThe method parsePackage failes to delete some resources\nin case of failures.\n\nAdded delete of \"package\" in the cases that was previously\nmissed.\n\nChange-Id: I183e9ec5864c5ed18bb48410ab41317cb3d96bda\n" }, { "commit": "0924ef6592c3172db6ae1f3d92f845951f901486", "tree": "36ab51ce244ec3750cef60dbee26d41d858b3e2f", "parents": [ "5957d6a889d9c9e46d260d915b9ffa66a763dd23", "0547ce55ebb2754c69cabe2b8c4687139b87cd5e" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Mon Jun 23 15:40:47 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Jun 21 03:13:40 2014 +0000" }, "message": "Merge \"Treat missing package usage data as a separate case\"" }, { "commit": "b416af13e748aca18a220a9f4a5232306af9c830", "tree": "c2a7d711c1a180410e04e656f5a52b53ba2fa0cd", "parents": [ "d24f557798d04bdd50f2a45e48b70b009a205b4a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 20 14:05:02 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 20 14:10:00 2014 -0700" }, "message": "Fix thumbnail bug\n\nWhen there was no thumbnail for a given image, the getThumbNail() convenience\nmethod could return a previously-returned thumbnail instead of null.\n\nb/15771860\nhttps://code.google.com/p/android/issues/detail?id\u003d40714\n\nChange-Id: Ibd18e048145bf347469f800afdf436247ea6b693\n" }, { "commit": "5957d6a889d9c9e46d260d915b9ffa66a763dd23", "tree": "d27b451d7d24ca6905bc0ff16c26e3e85e624d36", "parents": [ "d24f557798d04bdd50f2a45e48b70b009a205b4a", "ec4e780e5c3ffacabe2e41dfbf40636744666859" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jun 23 14:49:08 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 20 21:00:34 2014 +0000" }, "message": "Merge \"Fix frontOfTask assignment.\"" }, { "commit": "ec4e780e5c3ffacabe2e41dfbf40636744666859", "tree": "d27b451d7d24ca6905bc0ff16c26e3e85e624d36", "parents": [ "d24f557798d04bdd50f2a45e48b70b009a205b4a" ], "author": { "name": "Danny Baumann", "email": "dannybaumann@web.de", "time": "Sun Jun 22 16:55:36 2014 +0200" }, "committer": { "name": "Danny Baumann", "email": "dannybaumann@web.de", "time": "Mon Jun 23 08:43:37 2014 +0200" }, "message": "Fix frontOfTask assignment.\n\nIf all activities of a given stack were finishing, no activity was\nmarked as front-of-task. This confused ActivityManager, so make sure\nthere\u0027s always exactly one activity marked as front-of-task.\n\nChange-Id: I087cbe10280d4a60aa5ccfaefe24a223523fb3f2\n" }, { "commit": "a642a9ea3b2288b431ecb284b94a4657ae62889d", "tree": "8a93d92acd20411aae217d279288a984a4110a76", "parents": [ "ff6b0e24725c642f0681e214f143a8151e4e6bea", "d24f557798d04bdd50f2a45e48b70b009a205b4a" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Jun 20 19:53:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 20 19:53:36 2014 +0000" }, "message": "am d24f5577: Merge \"Use openssl\\\u0027s SHA1 instead of bionic\\\u0027s.\"\n\n* commit \u0027d24f557798d04bdd50f2a45e48b70b009a205b4a\u0027:\n Use openssl\u0027s SHA1 instead of bionic\u0027s.\n" }, { "commit": "0547ce55ebb2754c69cabe2b8c4687139b87cd5e", "tree": "7d8687e81086338307bacbc842003954aa329ab5", "parents": [ "b02dadd47c20b65569413cb4575c6050fe7b609f" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Thu Jun 19 09:38:06 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Fri Jun 20 12:53:19 2014 -0700" }, "message": "Treat missing package usage data as a separate case\n\nBug: 15520936\nChange-Id: I8e1c6921973f84af7ee94de91721cc4a3436ebaf\n" }, { "commit": "ff6b0e24725c642f0681e214f143a8151e4e6bea", "tree": "2fdb4d350c0e9c9343f8c8ec03d36a2c6d458a57", "parents": [ "447b68e767943fdde297d78321378e2623985a0a", "f18961066b7029652dacb9016bacbf192a6cf73d" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jun 20 16:30:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 20 16:30:40 2014 +0000" }, "message": "am f1896106: Merge \"Fixed VM memory leak in AudioSystem JNI interface\"\n\n* commit \u0027f18961066b7029652dacb9016bacbf192a6cf73d\u0027:\n Fixed VM memory leak in AudioSystem JNI interface\n" }, { "commit": "a06f5fa6563f7fc08b7bb2305f61bf649add0b5a", "tree": "4bb98e0ca5646b7d9ae7ca2e18dbe6538c44fd7b", "parents": [ "0924ef6592c3172db6ae1f3d92f845951f901486", "e279cd6d219de57cd56291e93a284c18d681edf0" ], "author": { "name": "Calin Juravle", "email": "calin@google.com", "time": "Mon Jun 23 17:23:02 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 20 03:03:45 2014 +0000" }, "message": "Merge \"Fix the initialization of some profile properties\"" }, { "commit": "d24f557798d04bdd50f2a45e48b70b009a205b4a", "tree": "3a78a8b632db289ffcd90258c6755d7e3ddb6999", "parents": [ "f18961066b7029652dacb9016bacbf192a6cf73d", "7bd29925044bc2a156cd8c939edc1005df38f2a3" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Jun 20 19:51:20 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 20 02:09:57 2014 +0000" }, "message": "Merge \"Use openssl\u0027s SHA1 instead of bionic\u0027s.\"" }, { "commit": "f18961066b7029652dacb9016bacbf192a6cf73d", "tree": "98155a19b9f8252935f6daae1007411f3fe4cdab", "parents": [ "b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7", "b637ccffd856ba911c1527077cec3abff39035f5" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jun 20 16:26:45 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 20 02:09:57 2014 +0000" }, "message": "Merge \"Fixed VM memory leak in AudioSystem JNI interface\"" }, { "commit": "e279cd6d219de57cd56291e93a284c18d681edf0", "tree": "76f9ea1f6529c85a4b750f30751eb2923c976c34", "parents": [ "b02dadd47c20b65569413cb4575c6050fe7b609f" ], "author": { "name": "Calin Juravle", "email": "calin@google.com", "time": "Thu Jun 19 18:51:47 2014 +0100" }, "committer": { "name": "Calin Juravle", "email": "calin@google.com", "time": "Thu Jun 19 18:51:47 2014 +0100" }, "message": "Fix the initialization of some profile properties\n\nChange-Id: I959cb53f262cfb9d1621e4cd99bec05514f7f11f\n" }, { "commit": "447b68e767943fdde297d78321378e2623985a0a", "tree": "0182422906aaae7f014ecc167d81fff0509c821c", "parents": [ "ff83ed2dc34f0595bcff2cb7b5d71bb39191963e", "b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Jun 19 16:07:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 19 16:07:52 2014 +0000" }, "message": "am b5e05cff: Merge \"Fixing parcel leaks to avoid virtual memory leak\"\n\n* commit \u0027b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7\u0027:\n Fixing parcel leaks to avoid virtual memory leak\n" }, { "commit": "ca2197b0457b1626b95a053d835ceaca43ac0286", "tree": "10ff72eff8944b443d80b877f35553edd83f6c09", "parents": [ "0d28bb47d771a2ac99cec6e4a071a98d2cd705dd" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jun 19 10:46:00 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jun 19 10:46:00 2014 +0100" }, "message": "Update javadoc for android.os.Bundle.\n\nCall out the fact that defaultValue is returned if a null\nmapping exists for a given key.\n\nbug: https://code.google.com/p/android/issues/detail?id\u003d68453\nChange-Id: Ifa6e94c1dee47809f70cadcb668cb98cb8dbef14\n" }, { "commit": "ff83ed2dc34f0595bcff2cb7b5d71bb39191963e", "tree": "c3d05c1b69d3a5cc6d89314e9aafa2027c2cf160", "parents": [ "f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc", "b02dadd47c20b65569413cb4575c6050fe7b609f" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Thu Jun 19 03:13:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 19 03:13:37 2014 +0000" }, "message": "am b02dadd4: Merge \"Create FieldPacker.getPos() to get the actual amount of data used for FP.\"\n\n* commit \u0027b02dadd47c20b65569413cb4575c6050fe7b609f\u0027:\n Create FieldPacker.getPos() to get the actual amount of data used for FP.\n" }, { "commit": "f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc", "tree": "66cd762a9d753b596361b2f4720dca7d2b459a89", "parents": [ "802aaf3b9d029e8f6fdb1bf0a81758484801d330", "8e21e21550eddce01ad06fdf05b342993bf44c6a" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Thu Jun 19 02:03:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 19 02:03:35 2014 +0000" }, "message": "am 8e21e215: Merge \"Switch from core to core-libart\"\n\n* commit \u00278e21e21550eddce01ad06fdf05b342993bf44c6a\u0027:\n Switch from core to core-libart\n" }, { "commit": "802aaf3b9d029e8f6fdb1bf0a81758484801d330", "tree": "39fd9e3ebba7ad9b5e385dbda1ed54e31a268553", "parents": [ "15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f", "47de306050576535014ff2b0c08006f951eea2ee" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Wed Jun 18 22:54:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 18 22:54:08 2014 +0000" }, "message": "am 47de3060: Merge \"Fix element size on 64b\"\n\n* commit \u002747de306050576535014ff2b0c08006f951eea2ee\u0027:\n Fix element size on 64b\n" }, { "commit": "b02dadd47c20b65569413cb4575c6050fe7b609f", "tree": "f09bd76126db83cd60fd5da2b74addd537bfb91a", "parents": [ "8e21e21550eddce01ad06fdf05b342993bf44c6a", "fa1275a6e743c4661cc3d5e05bb89559a8e59727" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Thu Jun 19 03:04:32 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 18 22:48:04 2014 +0000" }, "message": "Merge \"Create FieldPacker.getPos() to get the actual amount of data used for FP.\"" }, { "commit": "b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7", "tree": "a172b22d7f8076dd42d84cae4eb6f3d9e24ec05c", "parents": [ "b02dadd47c20b65569413cb4575c6050fe7b609f", "db1a9a3862e62ea088ced2ae04a78e515089ba7e" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Jun 19 16:02:11 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 18 22:48:04 2014 +0000" }, "message": "Merge \"Fixing parcel leaks to avoid virtual memory leak\"" }, { "commit": "db1a9a3862e62ea088ced2ae04a78e515089ba7e", "tree": "31dca876d362d8f7fdb4a0da15f5324b015b10d1", "parents": [ "ab9a19e38c685d0cb2952185af510322b26181a7" ], "author": { "name": "Maunik Shah", "email": "mshah@codeaurora.org", "time": "Thu Jun 19 14:18:39 2014 +0530" }, "committer": { "name": "Maunik Shah", "email": "mshah@codeaurora.org", "time": "Thu Jun 19 19:44:21 2014 +0530" }, "message": "Fixing parcel leaks to avoid virtual memory leak\n\nClient has to call recycle() on parcel object after its usage\notherwise native layer of binder won\u0027t clear the resources of\nparcel which were allocated for IPC\n\nChange-Id: Ib31ddcc92aa4ebd80bb66729922b9133692e9c9e\n" }, { "commit": "8e21e21550eddce01ad06fdf05b342993bf44c6a", "tree": "8c4369a2a4397b1fa5429b0eee88cf3f6a497e48", "parents": [ "47de306050576535014ff2b0c08006f951eea2ee", "dbcae5ceb766b0bc65fa819841f9bfab9ae11c2f" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Thu Jun 19 01:59:38 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 18 22:48:04 2014 +0000" }, "message": "Merge \"Switch from core to core-libart\"" }, { "commit": "dbcae5ceb766b0bc65fa819841f9bfab9ae11c2f", "tree": "20541e221c50f7d50713a2780242f8c63ecc93e2", "parents": [ "88b37edaeab7b31cab0f5115e5c9f63a49991408" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jun 18 15:11:01 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jun 18 17:43:27 2014 -0700" }, "message": "Switch from core to core-libart\n\nBug: 14298175\nChange-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f\n" }, { "commit": "fa1275a6e743c4661cc3d5e05bb89559a8e59727", "tree": "4c86df54c9a64caeccd458d68969bd67c65c808d", "parents": [ "88b37edaeab7b31cab0f5115e5c9f63a49991408" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Jun 17 17:25:04 2014 -0700" }, "committer": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Jun 18 00:24:44 2014 -0700" }, "message": "Create FieldPacker.getPos() to get the actual amount of data used for FP.\n\nWe need larger buffers to handle 64-bit RS object types, but 32-bit code\nwill never fill all of the getData().length bytes. This allows us to retain\nour verification code.\n\nWe have to modify an existing use of FieldPacker that was doing partial\nupdates of the underlying buffer. This was really relying on the old data\nto be implicitly selected and written back, but that is not guaranteed by\nthe original API. This also required a fix to the FieldPacker.reset() API,\nwhich was not allowing the FieldPacker to ever point to the final entry in\nits buffer.\n\nChange-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b\n" }, { "commit": "15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f", "tree": "9781b7988cb50d7ecfc30cd606bfecdf69ca4e70", "parents": [ "51736de19a4c225a54cda73754d0f57aa68def4f", "88b37edaeab7b31cab0f5115e5c9f63a49991408" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 17 22:47:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 17 22:47:50 2014 +0000" }, "message": "am 88b37eda: Merge \"Fix reading memory usage for 64-bit processes\"\n\n* commit \u002788b37edaeab7b31cab0f5115e5c9f63a49991408\u0027:\n Fix reading memory usage for 64-bit processes\n" }, { "commit": "88b37edaeab7b31cab0f5115e5c9f63a49991408", "tree": "840333219639355b71ac4b1fb71567baa106093c", "parents": [ "4c488cca531f209921cc4dfbc27ff7cdecfda71b", "0c6bc73c5e12dd4caae5bf3acbf1d26c3a9ad130" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 17 22:40:26 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 17 21:47:03 2014 +0000" }, "message": "Merge \"Fix reading memory usage for 64-bit processes\"" }, { "commit": "0c6bc73c5e12dd4caae5bf3acbf1d26c3a9ad130", "tree": "cc2b5404b0885ed585d79cf2c248c6c6bff25ade", "parents": [ "18cd9f57621b47889bdf81b2b04413569a999ef4" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 17 15:18:07 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 17 15:25:45 2014 -0700" }, "message": "Fix reading memory usage for 64-bit processes\n\n64-bit process will have virtual addresses that don\u0027t fit in an\nunsigned long if ActivityManagerService is in a 32-bit process,\nand the locations of the \u0027-\u0027 and \u0027 \u0027 characters in the maps\nare not predictable. Fix the sscanf for finding the start of the\nmapping, and use it again to find the end of the mapping. Also\nfix a few 64-bit warnings.\n\nChange-Id: I8855c76085142768be1d45346f1032fd37cbe4eb\n" }, { "commit": "47de306050576535014ff2b0c08006f951eea2ee", "tree": "c4a30f9ad69212d246da1677404cbc90f16d0867", "parents": [ "88b37edaeab7b31cab0f5115e5c9f63a49991408", "b49dfeaea96375b3b8fc1921f8b891c340f0baf2" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Wed Jun 18 21:21:29 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 17 21:42:00 2014 +0000" }, "message": "Merge \"Fix element size on 64b\"" }, { "commit": "b49dfeaea96375b3b8fc1921f8b891c340f0baf2", "tree": "c4a30f9ad69212d246da1677404cbc90f16d0867", "parents": [ "88b37edaeab7b31cab0f5115e5c9f63a49991408" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Wed Jun 18 13:17:57 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Wed Jun 18 13:17:57 2014 -0700" }, "message": "Fix element size on 64b\n\nRenderScript Element types know their own size. This\nchange properly tracks the new object sizes.\n\nChange-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969\n" }, { "commit": "51736de19a4c225a54cda73754d0f57aa68def4f", "tree": "dac33a6750780a03b23c6b9192a4cd8797e6d294", "parents": [ "e709d53ff31c74a6abf2a27350966d18d8dad4f7", "4c488cca531f209921cc4dfbc27ff7cdecfda71b" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jun 17 19:08:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 17 19:08:50 2014 +0000" }, "message": "am 4c488cca: Merge \"[Asset Manager] Fix memory leakage bug\"\n\n* commit \u00274c488cca531f209921cc4dfbc27ff7cdecfda71b\u0027:\n [Asset Manager] Fix memory leakage bug\n" }, { "commit": "8df5bd08c2ec7e492dc442bc57157a56f65572aa", "tree": "81c933a2ee0e543d5097f46338333da67c03b9d3", "parents": [ "0d28bb47d771a2ac99cec6e4a071a98d2cd705dd" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 17 12:59:46 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 17 13:07:45 2014 +0100" }, "message": "Explicitly list out the list of cache subdirs to prune.\n\nWe don\u0027t want directories like profiles and the former\nprofile-cache from being included in the prune. SELinux would\nhave prevented the move, but that\u0027s very brittle.\n\nbug: 15677279\n\nChange-Id: I2ff5db056757ffacaf108bb07b02dc0cac7172dd\n" }, { "commit": "4c488cca531f209921cc4dfbc27ff7cdecfda71b", "tree": "b4c2e624d7ad237c381fcae2631ff8b9a3e307dd", "parents": [ "0d28bb47d771a2ac99cec6e4a071a98d2cd705dd", "7c57d2337150ab52c148d30d9126f3b99ca951b4" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jun 17 18:48:24 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 17 05:00:50 2014 +0000" }, "message": "Merge \"[Asset Manager] Fix memory leakage bug\"" }, { "commit": "7bd29925044bc2a156cd8c939edc1005df38f2a3", "tree": "05c0fcfd822243ce760dc9bf4ec89bf8476346f8", "parents": [ "076dc0135b153cbcedbe584645c93cfe4390cdb0" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Jun 16 15:23:37 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Jun 16 17:01:21 2014 -0700" }, "message": "Use openssl\u0027s SHA1 instead of bionic\u0027s.\n\nBionic is removing its SHA1.\n\nChange-Id: I2b2d028223d2299666511a683cffba29c55639b7\n" }, { "commit": "e709d53ff31c74a6abf2a27350966d18d8dad4f7", "tree": "8b008d433c95dd73a2a0d3453743cc7c1d08422b", "parents": [ "b1fc06a4321f13360fcca49bbf87f87f34c22d58", "0d28bb47d771a2ac99cec6e4a071a98d2cd705dd" ], "author": { "name": "Chris Craik", "email": "ccraik@android.com", "time": "Mon Jun 16 23:43:21 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 16 23:43:21 2014 +0000" }, "message": "am 0d28bb47: Merge \"Fix the texture ID reuse issue in HWUI.\"\n\n* commit \u00270d28bb47d771a2ac99cec6e4a071a98d2cd705dd\u0027:\n Fix the texture ID reuse issue in HWUI.\n" }, { "commit": "b1fc06a4321f13360fcca49bbf87f87f34c22d58", "tree": "bb79eaf5c3594ad3e14e61b85cef04bf5bb87f58", "parents": [ "a803542aad4a58fe2446b8bf9cc4a4f59942d084", "5e7ef9489f3247c02395202d88fb4fb425aa8412" ], "author": { "name": "Chris Craik", "email": "ccraik@android.com", "time": "Mon Jun 16 23:43:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 16 23:43:16 2014 +0000" }, "message": "am 5e7ef948: Merge \"hwui: fix possible null pointer de-refrence\"\n\n* commit \u00275e7ef9489f3247c02395202d88fb4fb425aa8412\u0027:\n hwui: fix possible null pointer de-refrence\n" }, { "commit": "0d28bb47d771a2ac99cec6e4a071a98d2cd705dd", "tree": "9498ed5f334444da66df25d34e47f6c9952eb5df", "parents": [ "5e7ef9489f3247c02395202d88fb4fb425aa8412", "4a473c7d9406a2d6f6792f0f48d933424740ec5c" ], "author": { "name": "Chris Craik", "email": "ccraik@android.com", "time": "Mon Jun 16 23:37:12 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 16 22:13:20 2014 +0000" }, "message": "Merge \"Fix the texture ID reuse issue in HWUI.\"" }, { "commit": "5e7ef9489f3247c02395202d88fb4fb425aa8412", "tree": "9142da5de268e9e736b392e6fe1f28582ba2b9a3", "parents": [ "cb634bda7b0130015509b0e4d236d10b20b2340d", "1fa4cef34a8ac07e2ef15f2fef3dcfe520848c8d" ], "author": { "name": "Chris Craik", "email": "ccraik@android.com", "time": "Mon Jun 16 23:37:07 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 16 22:13:20 2014 +0000" }, "message": "Merge \"hwui: fix possible null pointer de-refrence\"" }, { "commit": "a803542aad4a58fe2446b8bf9cc4a4f59942d084", "tree": "9ea445d52c1776ac1a8be2f8a4ea9bdb8f758bcb", "parents": [ "df36dd200c55a6ad463b46bab0ffff49d21206ff", "cb634bda7b0130015509b0e4d236d10b20b2340d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jun 16 20:14:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 16 20:14:40 2014 +0000" }, "message": "am cb634bda: Merge \"clean up native com.android.internal.os.Zygote\"\n\n* commit \u0027cb634bda7b0130015509b0e4d236d10b20b2340d\u0027:\n clean up native com.android.internal.os.Zygote\n" }, { "commit": "18cd9f57621b47889bdf81b2b04413569a999ef4", "tree": "fae64e7fc1c56154fe1cff193845f45e057ebabe", "parents": [ "1afc29ae3895f7362e50f1d7b9f35bb689c96140" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 13 12:58:55 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jun 16 12:22:56 2014 -0700" }, "message": "clean up native com.android.internal.os.Zygote\n\nThis is never compiled for the host any more, so remove all the\nunnecesarry ifdefs.\n\nChange-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e\n" }, { "commit": "df36dd200c55a6ad463b46bab0ffff49d21206ff", "tree": "7881bfd7563881390eb4914efc199517edf66d57", "parents": [ "080671c5383f4b98303c143a685b9f5e75cfe781", "386caf6c8f276f1d03ea077bc799df2a937ef500" ], "author": { "name": "Tenghui Zhu", "email": "ztenghui@android.com", "time": "Mon Jun 16 17:13:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 16 17:13:53 2014 +0000" }, "message": "am 386caf6c: Merge \"update parameters in uploadToTexture() for GLES20\"\n\n* commit \u0027386caf6c8f276f1d03ea077bc799df2a937ef500\u0027:\n update parameters in uploadToTexture() for GLES20\n" }, { "commit": "080671c5383f4b98303c143a685b9f5e75cfe781", "tree": "dc50cf9d656e71f994428686bdae02d81d4a6d38", "parents": [ "6a6411e3d8c533a40bfe1897e2c26e3d6f3b52e0" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Fri Jan 31 12:57:20 2014 -0800" }, "committer": { "name": "Qiwen Zhao", "email": "zhao@google.com", "time": "Mon Jun 16 09:55:50 2014 -0700" }, "message": "DO NOT MERGE: Mark new util type functions as @hide in AOSP.\n\nChange-Id: I834e07aef142aa79ed1603535689d0b833357f6c\n" }, { "commit": "386caf6c8f276f1d03ea077bc799df2a937ef500", "tree": "51bfe7fbc54ba0ff7d7df7c91008f9623d3ee189", "parents": [ "076dc0135b153cbcedbe584645c93cfe4390cdb0", "c5e0a295418a1fd8c17608041962d70296af6794" ], "author": { "name": "Tenghui Zhu", "email": "ztenghui@android.com", "time": "Mon Jun 16 17:08:42 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 16 15:49:03 2014 +0000" }, "message": "Merge \"update parameters in uploadToTexture() for GLES20\"" }, { "commit": "cb634bda7b0130015509b0e4d236d10b20b2340d", "tree": "aaf6ccdcf2ebd1a4fcfa947266a9339f8174ee0d", "parents": [ "386caf6c8f276f1d03ea077bc799df2a937ef500", "18cd9f57621b47889bdf81b2b04413569a999ef4" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jun 16 20:08:30 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 16 15:34:52 2014 +0000" }, "message": "Merge \"clean up native com.android.internal.os.Zygote\"" }, { "commit": "6a6411e3d8c533a40bfe1897e2c26e3d6f3b52e0", "tree": "4584f90a02677b871a4450daf058f089dc06b9bd", "parents": [ "f36fe3f85daaf9e3b3270143d6648394768bb324", "076dc0135b153cbcedbe584645c93cfe4390cdb0" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jun 16 13:50:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 16 13:50:37 2014 +0000" }, "message": "am 076dc013: Merge \"Move dex file pruning to installd.\"\n\n* commit \u0027076dc0135b153cbcedbe584645c93cfe4390cdb0\u0027:\n Move dex file pruning to installd.\n" }, { "commit": "f36fe3f85daaf9e3b3270143d6648394768bb324", "tree": "b3177a0f4c1079ffef059c3b7cafb0330c98f85c", "parents": [ "8382b0d3c6639ee0eeadec02983bfceaf5ba0a32", "1083573c2feb6677ae5627a9ee41f82a697e22d4" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jun 16 10:56:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 16 10:56:34 2014 +0000" }, "message": "am 1083573c: Merge \"Track changes to libcore ICU apis.\"\n\n* commit \u00271083573c2feb6677ae5627a9ee41f82a697e22d4\u0027:\n Track changes to libcore ICU apis.\n" } ], "next": "8382b0d3c6639ee0eeadec02983bfceaf5ba0a32" }