)]}' { "log": [ { "commit": "5b17c0b5b418c340d3e5201a72ee8c88c1755355", "tree": "6a9669a90265a46bba05b89ad35ed9edbc13a8c4", "parents": [ "963698408b1ce0f2ac7eab1e863dc7271de116a3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 13 10:55:33 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 13 13:26:33 2014 -0700" }, "message": "Explicitly include Configuration.h\n\nMust include Configuration.h in any source file with #ifdef or #if that\ndepends on Configuration.h. This avoid inconsistencies that could result\nin subtle bugs.\n\nChange-Id: I99fdf19d56e7c73de4e7d672b937336b932a2a00\n" }, { "commit": "963698408b1ce0f2ac7eab1e863dc7271de116a3", "tree": "a3b2d430f8a439f2c95ed17c8e7e9edd51a69fc0", "parents": [ "5e4c4f12337ff4d7ceb105bcd441bb7aea6ab070" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 13 10:57:40 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 13 13:26:30 2014 -0700" }, "message": "Fix memory corruption if increaseSamplingN is not called\n\nChange-Id: Icbf9aaf68c25ba3330ceb79167bd776cf0342d0d\n" }, { "commit": "5e4c4f12337ff4d7ceb105bcd441bb7aea6ab070", "tree": "6b1150d91934edae729b4ec643daabae9545ab6f", "parents": [ "c26d923712a59e669d18191d93fbe3696789d592" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 14:50:48 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 16:34:50 2014 -0700" }, "message": "Fix bit rot in AudioStreamInSource\n\nIt obviously had not been compiled in a while.\n\nChange-Id: If514f474808e557a67a671c3b833572ad4a88338\n" }, { "commit": "c26d923712a59e669d18191d93fbe3696789d592", "tree": "735e84b0df3d43ff26b192e89beb756ac952b4bc", "parents": [ "110135b9610fee8bfa5bac2d9ef4fc4c24991c36" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 13:37:29 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 16:34:46 2014 -0700" }, "message": "Allow placement of Pipe buffer to be specified\n\nChange-Id: I2f6b68089ecfe85cd975d29ad0d0afd13c487002\n" }, { "commit": "110135b9610fee8bfa5bac2d9ef4fc4c24991c36", "tree": "3a6162c5e31107d96a7fc88ddfb0d69da97a510a", "parents": [ "844f88ccfcca95687e774bccb5e9065da61d33f8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 13:39:04 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 16:34:43 2014 -0700" }, "message": "Explicitly ignore return value of __futex_syscall3\n\nChange-Id: Ic65f257bfc4a0eff7bdd3c44fab68a3f17e2bd08\n" }, { "commit": "844f88ccfcca95687e774bccb5e9065da61d33f8", "tree": "bfe432c13ed27513ad40db6cac889f5d580514a1", "parents": [ "0fdbdd2a3909e4692fa3baaaa1f53eb91b31af56" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 13:38:09 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 16:34:39 2014 -0700" }, "message": "Cache mCblk in local variable cblk\n\nThis is the style used throughout the rest of AudioTrackShared.\n\nChange-Id: I959a6be3064e087bb19eba41173fd130dfcb4a9a\n" }, { "commit": "0fdbdd2a3909e4692fa3baaaa1f53eb91b31af56", "tree": "9bbed307e9f31f0715b5bdb723b753caadc6020b", "parents": [ "26d5ff926fa3323b39ae4408bcd29826a9523c9b", "fe9570c7b937b49d3603ccb394aed732b79bc6be" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 23:19:23 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 09 23:19:24 2014 +0000" }, "message": "Merge \"Remove obsolete IAudioRecord::getCblk()\"" }, { "commit": "26d5ff926fa3323b39ae4408bcd29826a9523c9b", "tree": "6abb6b28dfeffa2f5c602d350021dd8b4e6bd460", "parents": [ "16821ec9e1619f4edcc87f21ea1537580109b14d", "1035194cee4fbd57e35ea15c56e66cd09b63d56e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 09 23:18:47 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 09 23:18:48 2014 +0000" }, "message": "Merge \"audioflinger: refactor thread config events\"" }, { "commit": "fe9570c7b937b49d3603ccb394aed732b79bc6be", "tree": "9bc651997eec71010c91543e390472a6f155f775", "parents": [ "16821ec9e1619f4edcc87f21ea1537580109b14d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 08:42:25 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 16:15:49 2014 -0700" }, "message": "Remove obsolete IAudioRecord::getCblk()\n\nChange-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf\n" }, { "commit": "16821ec9e1619f4edcc87f21ea1537580109b14d", "tree": "37a6c2c5cc999557c0140cc6f5c46fd44e2cc31f", "parents": [ "01427884471391999393a15abbb95b5f0dce7d3b", "d776ac63ce9c013c9626226e43f7db606e035838" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 23:14:12 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 09 23:14:12 2014 +0000" }, "message": "Merge \"IAudioFlinger::openRecord returns IMemory(s)\"" }, { "commit": "1035194cee4fbd57e35ea15c56e66cd09b63d56e", "tree": "d443c6a41767ab240292494155885f65f88d7e76", "parents": [ "d283f68057204fcde95e6c9ba79a59f27ae58fe3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 08 18:49:52 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 09 15:25:49 2014 -0700" }, "message": "audioflinger: refactor thread config events\n\nMerge config events and set parameters messaging mechanism.\n- setting parameters now uses the config event mechanism\n- config event now allow to wait for a condition and synchronize caller\nbinder thread with execution thread and return an execution status.\n- simplify locking mechanism to avoid unlocking the thread\nmutex while processing events.\n\nChange-Id: Ia49cb3e617abec4bacb6c1f9a8cb304c4ed3902e\n" }, { "commit": "01427884471391999393a15abbb95b5f0dce7d3b", "tree": "fa913a5d908956170d4ed81c821352d45093e9bd", "parents": [ "70c2fd3dc648b512ea088ee9de5e505c626fd39c", "170056540e9ce65261b45efd15f67e72e2df1bed" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 09 19:08:24 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 09 19:08:24 2014 +0000" }, "message": "Merge \"Expose sample duration in MPEG4Extractor.\"" }, { "commit": "70c2fd3dc648b512ea088ee9de5e505c626fd39c", "tree": "87966e9e8f612576c35455e1c1c84770bba17f08", "parents": [ "0c5b910e6eb2b9b2a622ccc0dd66e8fcae3eb28b", "1da7ee098ac97d2fdd2cff16a2bfa51fd1889ad8" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 09 19:07:13 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 09 19:07:14 2014 +0000" }, "message": "Merge \"PlaylistFetcher: start queueing AUs after the 1st IDR nalu\"" }, { "commit": "d776ac63ce9c013c9626226e43f7db606e035838", "tree": "f75ca450359caa5a69b4124399d19d0522046826", "parents": [ "0c5b910e6eb2b9b2a622ccc0dd66e8fcae3eb28b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 09:16:09 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 09 11:32:43 2014 -0700" }, "message": "IAudioFlinger::openRecord returns IMemory(s)\n\nopenRecord() now explicitly returns the control block and data buffer\nas separate IMemory references. If the IMemory for data buffer\nis 0, this means it immediately follows the control block.\n\nChange-Id: Ic098f88f0e037f8fbe30006689e18cacacf09d06\n" }, { "commit": "0c5b910e6eb2b9b2a622ccc0dd66e8fcae3eb28b", "tree": "3c8b24b28168c11a884c6413640692c238f6aab5", "parents": [ "fc7fca77caa12993dd938d5ff43797d781291027", "908ea6603c64e29e40277a74c9fb0e776c097830" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 09 02:34:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 09 02:34:26 2014 +0000" }, "message": "Merge \"stagefright: set PTS for SoftwareRenderer\"" }, { "commit": "fc7fca77caa12993dd938d5ff43797d781291027", "tree": "14e40042e56178850395b4302291d7d84c2fe5cb", "parents": [ "e99703920adb8037c506bfc6d0159a1b9aa8cf7c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed May 07 15:31:28 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu May 08 19:32:05 2014 -0700" }, "message": "MediaCodec: add renderAndReleaseOutputBuffer() method with timestamp\n\nBug: 11784827\nChange-Id: Ia1dcbd6c1d1a4380db04b750c0eb3fa0bd58d7b4\n" }, { "commit": "e99703920adb8037c506bfc6d0159a1b9aa8cf7c", "tree": "70497eb056881065be0c4e7a0f23dbf07f63d599", "parents": [ "d283f68057204fcde95e6c9ba79a59f27ae58fe3", "7d8e3ccfbf326b5e190b416590e956c2fc3021f7" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 09 01:24:04 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 09 01:24:04 2014 +0000" }, "message": "Merge \"Allow BOM and space in WebVTT files\"" }, { "commit": "7d8e3ccfbf326b5e190b416590e956c2fc3021f7", "tree": "a15eb83cbf38e34b65b1b7e04544cceed0c6e133", "parents": [ "cdedf74e34117f9834055973880ee728f11d97cd" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu May 08 16:13:54 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu May 08 16:15:54 2014 -0700" }, "message": "Allow BOM and space in WebVTT files\n\nBug: 10900755\nChange-Id: I47a7a33f749ea2470ce7d9d36d33c7484637d61c\n" }, { "commit": "d283f68057204fcde95e6c9ba79a59f27ae58fe3", "tree": "b92285515487f16420a7024d3e3164c47738ab4d", "parents": [ "49f095546d047b52c5070229bbee0c3f27548256", "99401131e58f2ff7f5571037d0d53b6f684e5543" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 08 21:11:16 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 08 21:11:16 2014 +0000" }, "message": "Merge \"audio policy: fix mute delay when setting output device\"" }, { "commit": "99401131e58f2ff7f5571037d0d53b6f684e5543", "tree": "0a94d258392b447c8a8c457f6f085f7118ced3ce", "parents": [ "eee8fc78703dd77244407250402fe7464fe50fd3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 07 19:48:15 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 08 14:10:17 2014 -0700" }, "message": "audio policy: fix mute delay when setting output device\n\nThe duration of the temporary mute applied on each output\nwhen switching device must be more than twice the actual delay\nwe wait for the mute to be effective at the output.\nOtherwise some outputs with short latencies will be unmuted before the\ndevice switch is actually executed.\n\nThis change makes sure that we take the maximum wait time into account\nwhen requesting the delayed unmuting of each output.\n\nChange-Id: Id92c201b47786082a44b6a5c1c8015273835a42e\n" }, { "commit": "49f095546d047b52c5070229bbee0c3f27548256", "tree": "e8655eaaac3236025d96de19f86ad029aa5ed836", "parents": [ "96b292fd3c76f9af155ee6f7a8559258eeedc6fd", "cf79c7a576837d8bccecc80612a1f6f30bb328a8" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu May 08 13:48:00 2014 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu May 08 13:48:00 2014 -0700" }, "message": "resolved conflicts for merge of cf79c7a5 to master\n\nChange-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45\n" }, { "commit": "96b292fd3c76f9af155ee6f7a8559258eeedc6fd", "tree": "a52e3ff228517b1a9b0a712e9d73ce9358cb0ad3", "parents": [ "11cd9a68c3136ad5e5a5ea3bfd439fce3ce29b20", "b773038277ba328696832b690b91ce6e95bd1a6c" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu May 08 19:02:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 08 19:02:25 2014 +0000" }, "message": "Merge \"Add client side support for more AUDIO_FORMAT_PCM_*\"" }, { "commit": "11cd9a68c3136ad5e5a5ea3bfd439fce3ce29b20", "tree": "88efe29fdf1f4051bd7263b06940035e7102ae2b", "parents": [ "eee8fc78703dd77244407250402fe7464fe50fd3", "86aa02ce274826dc80ffa00766b16172c47503fd" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu May 08 17:43:04 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 08 17:43:04 2014 +0000" }, "message": "Merge \"Make AMediaCodec_create* APIs more like their Java counterparts\"" }, { "commit": "86aa02ce274826dc80ffa00766b16172c47503fd", "tree": "99aab102e4a44533c645b8a074759548e7f7fcf8", "parents": [ "cdedf74e34117f9834055973880ee728f11d97cd" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 07 16:03:54 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu May 08 09:36:08 2014 -0700" }, "message": "Make AMediaCodec_create* APIs more like their Java counterparts\n\nand add configure flags.\n\nChange-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590\n" }, { "commit": "eee8fc78703dd77244407250402fe7464fe50fd3", "tree": "05ce4a680a40cdf961de44a3b366e0898d7c4511", "parents": [ "cdedf74e34117f9834055973880ee728f11d97cd", "b880f5e5fc07397ddd09a94ba18bdf4fa62aae00" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu May 08 15:40:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 08 15:40:09 2014 +0000" }, "message": "Merge \"Add a per-thread heap that is read-only to clients\"" }, { "commit": "cf79c7a576837d8bccecc80612a1f6f30bb328a8", "tree": "1fb19ac1715580d5b479fe398296758d717101d9", "parents": [ "711719885d7563068579abf347c366cf6bc906f5", "02483465e294571a6a92fce4f38c933e77bf5e67" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu May 08 08:55:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 08 08:55:36 2014 +0000" }, "message": "am 02483465: am 1d2909b3: Merge \"Remove unused LOCAL_LDLIBS.\"\n\n* commit \u002702483465e294571a6a92fce4f38c933e77bf5e67\u0027:\n Remove unused LOCAL_LDLIBS.\n" }, { "commit": "02483465e294571a6a92fce4f38c933e77bf5e67", "tree": "f49ef95d19077adb965f6e5c6c57a900bba21484", "parents": [ "f655acf15e587dbf5d7120e9f2bf4b5bcb89941c", "1d2909b38f76d9d866e61cf505b88518d3a52acf" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu May 08 07:27:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 08 07:27:53 2014 +0000" }, "message": "am 1d2909b3: Merge \"Remove unused LOCAL_LDLIBS.\"\n\n* commit \u00271d2909b38f76d9d866e61cf505b88518d3a52acf\u0027:\n Remove unused LOCAL_LDLIBS.\n" }, { "commit": "1d2909b38f76d9d866e61cf505b88518d3a52acf", "tree": "a7236af32a23ae7c11412801420a5c54e21a46b1", "parents": [ "8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3", "5ee6049a22f1f3ef40020699841c98f4e6b30bc3" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu May 08 07:25:00 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu May 08 07:25:00 2014 +0000" }, "message": "Merge \"Remove unused LOCAL_LDLIBS.\"" }, { "commit": "5ee6049a22f1f3ef40020699841c98f4e6b30bc3", "tree": "a7236af32a23ae7c11412801420a5c54e21a46b1", "parents": [ "8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu May 08 00:23:11 2014 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Thu May 08 00:23:11 2014 -0700" }, "message": "Remove unused LOCAL_LDLIBS.\n\nChange-Id: I14865bee99fbcc5188b64fbd22bb49a1947ec6ff\n" }, { "commit": "908ea6603c64e29e40277a74c9fb0e776c097830", "tree": "3ee1bf42b18a95fc15d4ab589a74f7f4ce327fb6", "parents": [ "cdedf74e34117f9834055973880ee728f11d97cd" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed May 07 15:30:51 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed May 07 20:27:36 2014 -0700" }, "message": "stagefright: set PTS for SoftwareRenderer\n\nChange-Id: I08661a9eae09f919149aa5a58aa514d848de50a1\n" }, { "commit": "cdedf74e34117f9834055973880ee728f11d97cd", "tree": "003a3004f9656e162e311bf8a818cd5208350952", "parents": [ "36dae0a9ce8a1f2c7106aaf63b6d6c92300bfc8b", "657ff61389d7316f798d4abe03efac56fd528d91" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 08 02:35:04 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 08 02:35:05 2014 +0000" }, "message": "Merge \"audio policy: cleanup AudioPolicyService destructor\"" }, { "commit": "36dae0a9ce8a1f2c7106aaf63b6d6c92300bfc8b", "tree": "d57abc3f90c22e65e20eaf3e2acb9ed836e78ded", "parents": [ "0dd3c9cb0ed66888c224a97d817701df6c3b2655", "34d497283c66b5ef0f8855c007eaa20d7ac8b96d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 07 23:02:56 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 07 23:02:56 2014 +0000" }, "message": "Merge \"Expand AMediaFormat\"" }, { "commit": "b880f5e5fc07397ddd09a94ba18bdf4fa62aae00", "tree": "d90a68a7e3684a24909bbe85f57378656e043d01", "parents": [ "0dd3c9cb0ed66888c224a97d817701df6c3b2655" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 08:43:45 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 15:14:20 2014 -0700" }, "message": "Add a per-thread heap that is read-only to clients\n\nChange-Id: I401263566ca20fbfb565689c8fa99458d3b283b2\n" }, { "commit": "b773038277ba328696832b690b91ce6e95bd1a6c", "tree": "8c2ed603c214332d4599c564a49e057b6095bd15", "parents": [ "8e085cbeccb1138d52a0a423af02e6ab41b4fee4" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Apr 30 15:50:31 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 14:24:58 2014 -0700" }, "message": "Add client side support for more AUDIO_FORMAT_PCM_*\n\nAs much as possible, the checks for specific formats are done on server\nside. The only exception is 8-bit, which needs a client side workaround.\n\nChange-Id: I52fe086c039460c8dac009de03b67eb54c56a836\n" }, { "commit": "34d497283c66b5ef0f8855c007eaa20d7ac8b96d", "tree": "5f3cc71c9454f4081dd82eb9d42f47261ae11bc1", "parents": [ "08aaabe87960c04ecac180db1fe88b5a7bc2ed3b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 07 12:55:18 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 07 12:55:18 2014 -0700" }, "message": "Expand AMediaFormat\n\nRemove getDouble and getSize methods, since these are not used and/or\nnot present in the corresponding Java MediaFormat API.\nAdd setBuffer/getBuffer, needed for making formats for encoding, and\nadd other setters.\n\nChange-Id: I528d51b4ed571d852b949637f7ae3a95d31da7c1\n" }, { "commit": "0dd3c9cb0ed66888c224a97d817701df6c3b2655", "tree": "488257fb4ade824040ed884bdb7949402ff9af2e", "parents": [ "a079461668e881718fa6c0de967e557f59da1cab", "08aaabe87960c04ecac180db1fe88b5a7bc2ed3b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 07 19:55:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 07 19:55:10 2014 +0000" }, "message": "Merge \"Add NDK version of MediaMuxer\"" }, { "commit": "657ff61389d7316f798d4abe03efac56fd528d91", "tree": "9481cad78a4b2adeb25587c3838ad4357ad2da54", "parents": [ "5e0e2316578b8b9eccdf4002951d6e9cd96adaac" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 07 11:58:24 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 07 11:58:24 2014 -0700" }, "message": "audio policy: cleanup AudioPolicyService destructor\n\nNo need to clear strong pointers in the destuctor.\nAdd explicit exit() command to mOutputCommandThread.\n\nChange-Id: I60bb248fe6a20bfd8a55358ef139692b93df0238\n" }, { "commit": "a079461668e881718fa6c0de967e557f59da1cab", "tree": "0ace22f014314582cb2e02fe746da5bf9ae40cb4", "parents": [ "703b67ed9552914f7763aed8f8bd054759db0576", "828f883a43f66f77d776a75d0ea2b87c7c826071" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 18:55:03 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 07 18:55:04 2014 +0000" }, "message": "Merge \"Fix a couple of fast capture typo bugs\"" }, { "commit": "828f883a43f66f77d776a75d0ea2b87c7c826071", "tree": "ab16e918df8275d8460a00b72cdd6ced890350bb", "parents": [ "8e085cbeccb1138d52a0a423af02e6ab41b4fee4" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 11:17:52 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 07 11:28:13 2014 -0700" }, "message": "Fix a couple of fast capture typo bugs\n\nAudioRecord constructor was not passing flags through to set().\nServer-side check was using wrong kind of channel mask.\n\nChange-Id: Ifaa880ec323771e9fd168262be05f3e539f53390\n" }, { "commit": "703b67ed9552914f7763aed8f8bd054759db0576", "tree": "a7fa265ddc0be6ff74821c68d72c2dc01e7ebc75", "parents": [ "5b61dddd0dba28922068da2487894761486aec6c", "784e24e386b088c05d653ab482f2e95cb53e3d01" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed May 07 16:59:29 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 07 16:59:29 2014 +0000" }, "message": "Merge \"Remove legacy omx_message variables\"" }, { "commit": "08aaabe87960c04ecac180db1fe88b5a7bc2ed3b", "tree": "740a80ccc357b0a138445b2728c32ee9762db745", "parents": [ "8e085cbeccb1138d52a0a423af02e6ab41b4fee4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 06 16:08:19 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 07 09:57:08 2014 -0700" }, "message": "Add NDK version of MediaMuxer\n\nand add some constness here and there.\n\nChange-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1\n" }, { "commit": "5b61dddd0dba28922068da2487894761486aec6c", "tree": "068b24eb9da2b95f25f4954e43e8bccb25097f76", "parents": [ "5e0e2316578b8b9eccdf4002951d6e9cd96adaac" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 07 09:10:01 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 07 09:10:01 2014 -0700" }, "message": "audio policy: fix typo in AudioPolicyManager constructor\n\nFix cut/paste error in new AudioPolicyManager constructor\ncausing the same index variable to be reused in nested for loops.\n\nChange-Id: Id57ff19bf6dd8974486b07c8252029e377df2747\n" }, { "commit": "5e0e2316578b8b9eccdf4002951d6e9cd96adaac", "tree": "49bfe18b49271319afbd2a3a7bf55c5995061ee9", "parents": [ "8e085cbeccb1138d52a0a423af02e6ab41b4fee4", "d46929666d7e4b1cad45afd7dcb883ec4dd2d49f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 07 15:58:07 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 07 15:58:07 2014 +0000" }, "message": "Merge \"audio policy: update from libhardware_legacy\"" }, { "commit": "784e24e386b088c05d653ab482f2e95cb53e3d01", "tree": "ca27ef5685b4a3128947c9969f491399601efd63", "parents": [ "7ebe2c64dea42a3fd4de34ccb877d23b7a4e8076" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue May 06 15:05:53 2014 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue May 06 15:46:41 2014 -0700" }, "message": "Remove legacy omx_message variables\n\nRemove platform_private and data_ptr from omx_message.\nThese were used for legacy deferred buffer creation.\nSee OMXCodec quirks: kDefersOutputBufferAllocation and\nkRequiresAllocateBufferOnOutputPorts.\n\nChange-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf\nSigned-off-by: Andy Hung \u003chunga@google.com\u003e\n" }, { "commit": "8e085cbeccb1138d52a0a423af02e6ab41b4fee4", "tree": "1d8b84f794ba38e0670e0ce7321d5ee00c90fc61", "parents": [ "14136039b752376240698e8b422c76de01488bc5", "7c9b141d551fde406f199f0dd21582f8551aea23" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 06 22:46:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 06 22:46:09 2014 +0000" }, "message": "Merge \"MediaFormat owns its strings\"" }, { "commit": "14136039b752376240698e8b422c76de01488bc5", "tree": "9aa7593033b5f87a4b8a28e24392188260c36a72", "parents": [ "7ebe2c64dea42a3fd4de34ccb877d23b7a4e8076", "13c878f07fb36a49aade20cec684ed8e12724751" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue May 06 18:37:54 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 06 18:37:54 2014 +0000" }, "message": "Merge \"Camera3: fix missing string in logging code\"" }, { "commit": "13c878f07fb36a49aade20cec684ed8e12724751", "tree": "d51f85fe8577b9cd06bd269dc1fae30b8b38f053", "parents": [ "fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue May 06 11:33:52 2014 -0700" }, "committer": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue May 06 11:33:52 2014 -0700" }, "message": "Camera3: fix missing string in logging code\n\nChange-Id: I15da6bb8b586b4641837f42d2145530fb45dd0bd\n" }, { "commit": "d46929666d7e4b1cad45afd7dcb883ec4dd2d49f", "tree": "7955b56d436b8856b6164cb37e16bdfbe2ad81c4", "parents": [ "7ebe2c64dea42a3fd4de34ccb877d23b7a4e8076" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon May 05 18:13:44 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 06 10:40:14 2014 -0700" }, "message": "audio policy: update from libhardware_legacy\n\nMerge changes made to AudioPolicyManagerBase in libhardware_legacy\nsince it was forked here:\n\nfd61179 Update policy handling for USB inputs\nc7b6e3c audio: allow compiling for 64-bit\nc26f454 Initial implementation of USB Audio output.\na7b1bc9 Audio policy is 32-bit only\n26101ad audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable\n\nChange-Id: I22bc883c20603a6598c6ee3ded636e9cc4d9ec03\n" }, { "commit": "7c9b141d551fde406f199f0dd21582f8551aea23", "tree": "a85ae2f96546c0a1f3b81532f4dda22a72d942a5", "parents": [ "91d8ec1860e8186cd202f9415f6b41c20fbd54fb" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 06 10:33:07 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 06 10:37:04 2014 -0700" }, "message": "MediaFormat owns its strings\n\nHave MediaFormat own the strings it returns from toString and getString,\nreducing the chance of memory leaks.\n\nChange-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108\n" }, { "commit": "7ebe2c64dea42a3fd4de34ccb877d23b7a4e8076", "tree": "aba8cbdf008c711cc6e11109e5b15f9f47ac4e52", "parents": [ "dfa829c3ca81fcd2eecaabfff630ac0f41453731", "711719885d7563068579abf347c366cf6bc906f5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 06 15:35:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 06 15:35:34 2014 +0000" }, "message": "am 71171988: am f655acf1: am 8fb04d47: Merge \"Fix memory leak when filtering commands in insertCommand_l()\"\n\n* commit \u0027711719885d7563068579abf347c366cf6bc906f5\u0027:\n Fix memory leak when filtering commands in insertCommand_l()\n" }, { "commit": "711719885d7563068579abf347c366cf6bc906f5", "tree": "4ce89710da2d5ed27468c721cfc4d1156bbbde75", "parents": [ "63249d6ea560b2f29d3ee255951f527b01ecbac5", "f655acf15e587dbf5d7120e9f2bf4b5bcb89941c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 06 15:30:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 06 15:30:49 2014 +0000" }, "message": "am f655acf1: am 8fb04d47: Merge \"Fix memory leak when filtering commands in insertCommand_l()\"\n\n* commit \u0027f655acf15e587dbf5d7120e9f2bf4b5bcb89941c\u0027:\n Fix memory leak when filtering commands in insertCommand_l()\n" }, { "commit": "f655acf15e587dbf5d7120e9f2bf4b5bcb89941c", "tree": "551729d7a78dd7fda0fe9221425af598c6b50ebf", "parents": [ "bc4bf532b7581ecb1c8734a63742183c3ecb02c5", "8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 06 15:28:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 06 15:28:39 2014 +0000" }, "message": "am 8fb04d47: Merge \"Fix memory leak when filtering commands in insertCommand_l()\"\n\n* commit \u00278fb04d474ed9e0d1302ae223ee76fafbe5fb41a3\u0027:\n Fix memory leak when filtering commands in insertCommand_l()\n" }, { "commit": "8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3", "tree": "7f6d93406b9f7a9474412a02e764054e0d6503c1", "parents": [ "b231408849158baea8dddc0edf7e97fcfc2e3240", "48412dc92c4cc92a3f4821616e12290f5eeabd07" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 06 15:25:45 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 06 15:25:46 2014 +0000" }, "message": "Merge \"Fix memory leak when filtering commands in insertCommand_l()\"" }, { "commit": "dfa829c3ca81fcd2eecaabfff630ac0f41453731", "tree": "8c8e41e5ca296434cc94380112f0d6e545909af1", "parents": [ "ca40059363b3dc5a743ea46875623e625f424baa", "0ae7801bd228025dc4941be086f88e34b70df90f" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue May 06 00:45:15 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 06 00:45:15 2014 +0000" }, "message": "Merge \"Remove warnings in recordvideo\"" }, { "commit": "0ae7801bd228025dc4941be086f88e34b70df90f", "tree": "614f8799475721e3a1814fb9878aaf7da8be904c", "parents": [ "f4b0e603d3e27728ca19c02a44342607a54db7d4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu May 01 18:47:58 2014 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon May 05 17:41:58 2014 -0700" }, "message": "Remove warnings in recordvideo\n\nChange-Id: I2ed72836210fd3a02c7bceeb5fccadf8dcb92fbc\nSigned-off-by: Andy Hung \u003chunga@google.com\u003e\n" }, { "commit": "ca40059363b3dc5a743ea46875623e625f424baa", "tree": "f2844811d0b17c8d1911cfe1513931725e1ae153", "parents": [ "91d8ec1860e8186cd202f9415f6b41c20fbd54fb", "f4b0e603d3e27728ca19c02a44342607a54db7d4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue May 06 00:17:13 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 06 00:17:14 2014 +0000" }, "message": "Merge \"Fix audioloop test program\"" }, { "commit": "f4b0e603d3e27728ca19c02a44342607a54db7d4", "tree": "c8e5181c9bd72c2fb77b400a8e69912eb25fa720", "parents": [ "6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Apr 23 18:34:02 2014 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon May 05 16:51:34 2014 -0700" }, "message": "Fix audioloop test program\n\nChange-Id: Ic31966095d719cf2b33322675d7d0a2e6a203268\nSigned-off-by: Andy Hung \u003chunga@google.com\u003e\n" }, { "commit": "91d8ec1860e8186cd202f9415f6b41c20fbd54fb", "tree": "81a67b21ef1a7c0e024d1fe15311f6ab893878f8", "parents": [ "67c9437dcf0d4076ed12c1f6ec157e4c7d6f353b", "83ae5be9a9928a7265e40d2906530e56eb3bc20c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 05 21:49:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 05 21:49:25 2014 +0000" }, "message": "Merge \"Don\u0027t build libmediandk for PDK\"" }, { "commit": "83ae5be9a9928a7265e40d2906530e56eb3bc20c", "tree": "5c14ef439417f495c1b734c661bde9710bdc0a24", "parents": [ "0c3be875376adaee8d8e8dd917c64926e1513b29" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 05 14:48:34 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 05 14:48:34 2014 -0700" }, "message": "Don\u0027t build libmediandk for PDK\n\nChange-Id: I9b2e5f5c8cc0fad59d4a4268c8767f540d536d10\n" }, { "commit": "67c9437dcf0d4076ed12c1f6ec157e4c7d6f353b", "tree": "f8543f5e19dbf8f26f8dc86395427da14526dda0", "parents": [ "d8484dd4cf124854e7ff950da4300887f32fd05b", "0c3be875376adaee8d8e8dd917c64926e1513b29" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 05 21:07:52 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 05 21:07:52 2014 +0000" }, "message": "Merge \"WIP: MediaCodec and friends NDK APIs, plain C version\"" }, { "commit": "d8484dd4cf124854e7ff950da4300887f32fd05b", "tree": "d73f7050caa36e2f8837f700472dc05cb93ec286", "parents": [ "f2776a5692bb4228decbe4ea3c8cc6df1d9c684c", "993fa0603707e94ce259e95e56838a85b5ccbdc5" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon May 05 17:57:57 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 05 17:57:58 2014 +0000" }, "message": "Merge \"Use audio_is_linear_pcm()\"" }, { "commit": "0c3be875376adaee8d8e8dd917c64926e1513b29", "tree": "97643df739a33f80cf3dc106b013319549e829a5", "parents": [ "fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu May 01 10:14:44 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 05 10:48:54 2014 -0700" }, "message": "WIP: MediaCodec and friends NDK APIs, plain C version\n\nChange-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df\n" }, { "commit": "f2776a5692bb4228decbe4ea3c8cc6df1d9c684c", "tree": "de826271c5cd7aaabb8c587b5a9e501ecf779228", "parents": [ "6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9", "f81648ec38ff63f1f35516fa27c1c24d846e9ba5" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Mon May 05 17:40:08 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 05 17:40:09 2014 +0000" }, "message": "Merge \"camera3: Update CameraMetadata vendor tag handling.\"" }, { "commit": "6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9", "tree": "798f8977a9b12767c61da988f474901eaf9cab2e", "parents": [ "fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9", "e1b55da41878255570f18809c5fee72544740344" ], "author": { "name": "Natalie Silvanovich", "email": "natashenka@google.com", "time": "Mon May 05 17:10:14 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 05 17:10:15 2014 +0000" }, "message": "Merge \"NULL check in ConnectPro\"" }, { "commit": "e1b55da41878255570f18809c5fee72544740344", "tree": "8b7463ec103ad2fb15381d9e42429f0b7b3db019", "parents": [ "c6b8225e759d1790d9a38082a18ce7e24a3dba27" ], "author": { "name": "Natalie Silvanovich", "email": "natashenka@google.com", "time": "Thu May 01 14:44:52 2014 -0700" }, "committer": { "name": "Natalie Silvanovich", "email": "natashenka@google.com", "time": "Mon May 05 09:20:47 2014 -0700" }, "message": "NULL check in ConnectPro\n\nPrevents service crash\n\nBug: 13744720\nChange-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd\n" }, { "commit": "f81648ec38ff63f1f35516fa27c1c24d846e9ba5", "tree": "826a0e862b52bbbe22586c08693569dee723f5ff", "parents": [ "fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Thu Apr 17 16:14:57 2014 -0700" }, "committer": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Fri May 02 20:33:45 2014 -0700" }, "message": "camera3: Update CameraMetadata vendor tag handling.\n\nBug: 12134423\nChange-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43\n" }, { "commit": "fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9", "tree": "8c35d32339aef06d77648a8fa7961d058e8356f9", "parents": [ "6c516d800d97b7f25a22574998cb055c9d7f7b16", "6770260f83f5576b041b7b3a2536d082a631f9b0" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Sat May 03 00:29:04 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 03 00:29:04 2014 +0000" }, "message": "Merge \"Revert \"camera3: Update CameraMetadata vendor tag handling.\"\"" }, { "commit": "6770260f83f5576b041b7b3a2536d082a631f9b0", "tree": "afcf4bf640ea8ad973e2e613d4d5fee2e21377d3", "parents": [ "4764324d2704f1b08bb7407014bf203924ff2363" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Sat May 03 00:28:33 2014 +0000" }, "committer": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Sat May 03 00:28:33 2014 +0000" }, "message": "Revert \"camera3: Update CameraMetadata vendor tag handling.\"\n\nThis reverts commit 4764324d2704f1b08bb7407014bf203924ff2363.\n\nChange-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76\n" }, { "commit": "6c516d800d97b7f25a22574998cb055c9d7f7b16", "tree": "a6b9e79950b0db6af168216b1e71aa63eb095eb3", "parents": [ "0a9aa4f5539482061dfe4dfa6128ef3696557818", "4764324d2704f1b08bb7407014bf203924ff2363" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Fri May 02 22:23:44 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 02 22:23:44 2014 +0000" }, "message": "Merge \"camera3: Update CameraMetadata vendor tag handling.\"" }, { "commit": "4764324d2704f1b08bb7407014bf203924ff2363", "tree": "9aefad4eac4e67affaf093ec293fb7e0f95ba95e", "parents": [ "32fa3c6fab55b075c916f4dad38e42e239bb7813" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Thu Apr 17 16:14:57 2014 -0700" }, "committer": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Fri May 02 15:22:25 2014 -0700" }, "message": "camera3: Update CameraMetadata vendor tag handling.\n\nBug: 12134423\nChange-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e\n" }, { "commit": "0a9aa4f5539482061dfe4dfa6128ef3696557818", "tree": "8c35d32339aef06d77648a8fa7961d058e8356f9", "parents": [ "ad3770a20daf1265a088404edbd2ca340166e9ef", "c4b88a8d0f524666bf0f390075c334d047a104f2" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 21:59:52 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 02 21:59:52 2014 +0000" }, "message": "Merge \"Fix bug for direct track with PCM !\u003d 16-bit\"" }, { "commit": "c4b88a8d0f524666bf0f390075c334d047a104f2", "tree": "a2d45172a9d794b8b626ed9acadb656e346b2e9c", "parents": [ "b53fc4ef8da47df8d5f580e8ee6135866ffebc33" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Apr 30 16:54:30 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 11:52:56 2014 -0700" }, "message": "Fix bug for direct track with PCM !\u003d 16-bit\n\nThe AUDIO_FORMAT_PCM_8_BIT format was being converted to\nAUDIO_FORMAT_PCM_16_BIT on client side even for direct tracks.\nThat conversion was incorrect; it should only be done for mixed tracks.\n\nAlso remove checks for specific PCM formats in the generic part of\nserver side of createTrack. Those format checks should only be done by\nthe thread. This will allow direct tracks for PCM 8-bit, PCM 24-bit, etc.\n\nChange-Id: If5b9fd79f8642ed93e2aeabcaf4809b2ed798978\n" }, { "commit": "ad3770a20daf1265a088404edbd2ca340166e9ef", "tree": "c45661596cf8287ac490f2e293d4288ac34cffd2", "parents": [ "33a610c4a79975eb585526195a7c8eae8177777b", "e11ae4b2f7d38c8092e7c67ff06610165d866d98" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Fri May 02 18:45:46 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 02 18:45:46 2014 +0000" }, "message": "Merge \"Camera3: Don\u0027t notifyError for non-fatal errors\"" }, { "commit": "993fa0603707e94ce259e95e56838a85b5ccbdc5", "tree": "df2318b3af52103e1cfaa577857759560b1df802", "parents": [ "b53fc4ef8da47df8d5f580e8ee6135866ffebc33" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 11:14:34 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 11:17:21 2014 -0700" }, "message": "Use audio_is_linear_pcm()\n\nChange-Id: I17b30fdb6dbb6454ad0a20dd703fd603a37a8397\n" }, { "commit": "33a610c4a79975eb585526195a7c8eae8177777b", "tree": "e47c535870d06533653c01d2d9b3253fe6c53608", "parents": [ "344a1b9bb5cba14a0771c8b416466678aff3215f", "63249d6ea560b2f29d3ee255951f527b01ecbac5" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 18:10:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 18:10:24 2014 +0000" }, "message": "am 63249d6e: am bc4bf532: am b2314088: Merge \"AwesomePlayer: use PTS for queueBuffer\"\n\n* commit \u002763249d6ea560b2f29d3ee255951f527b01ecbac5\u0027:\n AwesomePlayer: use PTS for queueBuffer\n" }, { "commit": "344a1b9bb5cba14a0771c8b416466678aff3215f", "tree": "9799ffde4926129da9717b6ba18d96ec571cf019", "parents": [ "b0210338bba812d27e0e6b1bb4b6b89405209a19", "113f2122662856f2482836f1b4c585a050888afa" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 18:06:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 18:06:42 2014 +0000" }, "message": "am 113f2122: am 5fa3f7af: am b52675e9: Merge \"Smooth out AwesomePlayer\"\n\n* commit \u0027113f2122662856f2482836f1b4c585a050888afa\u0027:\n Smooth out AwesomePlayer\n" }, { "commit": "63249d6ea560b2f29d3ee255951f527b01ecbac5", "tree": "3767eab29e056c723861085fd8e7c0fa6ef2a336", "parents": [ "113f2122662856f2482836f1b4c585a050888afa", "bc4bf532b7581ecb1c8734a63742183c3ecb02c5" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 18:04:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 18:04:22 2014 +0000" }, "message": "am bc4bf532: am b2314088: Merge \"AwesomePlayer: use PTS for queueBuffer\"\n\n* commit \u0027bc4bf532b7581ecb1c8734a63742183c3ecb02c5\u0027:\n AwesomePlayer: use PTS for queueBuffer\n" }, { "commit": "bc4bf532b7581ecb1c8734a63742183c3ecb02c5", "tree": "f319a10628680be392d150b3b3798fe4dee752c4", "parents": [ "5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5", "b231408849158baea8dddc0edf7e97fcfc2e3240" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 18:01:21 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 18:01:21 2014 +0000" }, "message": "am b2314088: Merge \"AwesomePlayer: use PTS for queueBuffer\"\n\n* commit \u0027b231408849158baea8dddc0edf7e97fcfc2e3240\u0027:\n AwesomePlayer: use PTS for queueBuffer\n" }, { "commit": "113f2122662856f2482836f1b4c585a050888afa", "tree": "e0e15724deeadb53d5bec3968ed631880658f5a9", "parents": [ "9e0922ba7dda72fc94d2af2872cfc630ad599c91", "5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 18:00:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 18:00:44 2014 +0000" }, "message": "am 5fa3f7af: am b52675e9: Merge \"Smooth out AwesomePlayer\"\n\n* commit \u00275fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5\u0027:\n Smooth out AwesomePlayer\n" }, { "commit": "5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5", "tree": "b5de50f5e4f175762e35831fd3f20347492b7d20", "parents": [ "6e76fda36a87e154397de816fa091b721a4c11bd", "b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:57:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 17:57:56 2014 +0000" }, "message": "am b52675e9: Merge \"Smooth out AwesomePlayer\"\n\n* commit \u0027b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb\u0027:\n Smooth out AwesomePlayer\n" }, { "commit": "b231408849158baea8dddc0edf7e97fcfc2e3240", "tree": "1e9125cf81aa22bfb2c2540be461bc35c8653ec1", "parents": [ "b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb", "a6e6c70a3c5403e178741eee20c7742e736c4818" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:56:37 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 02 17:56:37 2014 +0000" }, "message": "Merge \"AwesomePlayer: use PTS for queueBuffer\"" }, { "commit": "b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb", "tree": "c97f8a12eb2c489c445fa54858ecedb9f7078451", "parents": [ "f9782266802b02fc06a9c532f40128496aefb3e0", "1b78c4b1484c7d4c12b9a87329dc8d4b6e8c0c37" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:53:58 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 02 17:53:58 2014 +0000" }, "message": "Merge \"Smooth out AwesomePlayer\"" }, { "commit": "b0210338bba812d27e0e6b1bb4b6b89405209a19", "tree": "a67218cf464634821e0f98060da0ed07605fd8b5", "parents": [ "192d6a509cf609a2a4b7f9cb70aeb5daabb0204e", "9e0922ba7dda72fc94d2af2872cfc630ad599c91" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:21:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 17:21:53 2014 +0000" }, "message": "am 9e0922ba: am 6e76fda3: am f9782266: Merge \"AwesomePlayer: improve scheduling of video event to hit PTS\"\n\n* commit \u00279e0922ba7dda72fc94d2af2872cfc630ad599c91\u0027:\n AwesomePlayer: improve scheduling of video event to hit PTS\n" }, { "commit": "192d6a509cf609a2a4b7f9cb70aeb5daabb0204e", "tree": "c5c78fc7e223d6072102bdd003ab51c0742ce44a", "parents": [ "b53fc4ef8da47df8d5f580e8ee6135866ffebc33", "edf6131d1eca1fdff3b151805d241a1cc81b52ca" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:21:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 17:21:52 2014 +0000" }, "message": "am edf6131d: am 075c8f6e: am a69d6f52: Merge \"stagefright: add ClockEstimator API and WindowedLinearFitEstimator\"\n\n* commit \u0027edf6131d1eca1fdff3b151805d241a1cc81b52ca\u0027:\n stagefright: add ClockEstimator API and WindowedLinearFitEstimator\n" }, { "commit": "9e0922ba7dda72fc94d2af2872cfc630ad599c91", "tree": "5e7501642f232712e9c4da0f5280e65b4179f89b", "parents": [ "edf6131d1eca1fdff3b151805d241a1cc81b52ca", "6e76fda36a87e154397de816fa091b721a4c11bd" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:18:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 17:18:02 2014 +0000" }, "message": "am 6e76fda3: am f9782266: Merge \"AwesomePlayer: improve scheduling of video event to hit PTS\"\n\n* commit \u00276e76fda36a87e154397de816fa091b721a4c11bd\u0027:\n AwesomePlayer: improve scheduling of video event to hit PTS\n" }, { "commit": "edf6131d1eca1fdff3b151805d241a1cc81b52ca", "tree": "1f9a45db703b5d57653099dd783868c150b8dbfd", "parents": [ "47c888a9fb74f8a46fbf666f0611fd1a9491466f", "075c8f6e174e824b6bc95809cc25f1430e9d4e62" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:18:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 17:18:01 2014 +0000" }, "message": "am 075c8f6e: am a69d6f52: Merge \"stagefright: add ClockEstimator API and WindowedLinearFitEstimator\"\n\n* commit \u0027075c8f6e174e824b6bc95809cc25f1430e9d4e62\u0027:\n stagefright: add ClockEstimator API and WindowedLinearFitEstimator\n" }, { "commit": "6e76fda36a87e154397de816fa091b721a4c11bd", "tree": "ade8f036469e156f3bbd2dbd1e63e62509efcffd", "parents": [ "075c8f6e174e824b6bc95809cc25f1430e9d4e62", "f9782266802b02fc06a9c532f40128496aefb3e0" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:14:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 17:14:18 2014 +0000" }, "message": "am f9782266: Merge \"AwesomePlayer: improve scheduling of video event to hit PTS\"\n\n* commit \u0027f9782266802b02fc06a9c532f40128496aefb3e0\u0027:\n AwesomePlayer: improve scheduling of video event to hit PTS\n" }, { "commit": "075c8f6e174e824b6bc95809cc25f1430e9d4e62", "tree": "7db2a5c1981c4f3ca75c4a36a991a23485160c9a", "parents": [ "e580aa4a756d1825c440a4b4309022b1babb6de1", "a69d6f529239950a8bdf5e4253ea13bb029375cb" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:14:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 17:14:17 2014 +0000" }, "message": "am a69d6f52: Merge \"stagefright: add ClockEstimator API and WindowedLinearFitEstimator\"\n\n* commit \u0027a69d6f529239950a8bdf5e4253ea13bb029375cb\u0027:\n stagefright: add ClockEstimator API and WindowedLinearFitEstimator\n" }, { "commit": "f9782266802b02fc06a9c532f40128496aefb3e0", "tree": "b198af2c74d7c6b2b720a3093ffa2b1104c89de9", "parents": [ "a69d6f529239950a8bdf5e4253ea13bb029375cb", "9747b68530aa65b04751b43bf4ce3385b5d781f9" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:11:14 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 02 17:11:14 2014 +0000" }, "message": "Merge \"AwesomePlayer: improve scheduling of video event to hit PTS\"" }, { "commit": "a69d6f529239950a8bdf5e4253ea13bb029375cb", "tree": "01e2de0a817fe6cdd9c9c674015d8e927e7e5f74", "parents": [ "86438382a381eb39ed8da53fbd16cf6730fded6c", "aa8b569eb652c22821b93a6e543449a52ad21158" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri May 02 17:10:57 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 02 17:10:58 2014 +0000" }, "message": "Merge \"stagefright: add ClockEstimator API and WindowedLinearFitEstimator\"" }, { "commit": "b53fc4ef8da47df8d5f580e8ee6135866ffebc33", "tree": "e0ae90826c9f015c3f4f48faddf93b94ed84aea6", "parents": [ "33ddcb6f1049cb4b6c71bb7ea605375f9492601d", "47c888a9fb74f8a46fbf666f0611fd1a9491466f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 08:03:58 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 08:03:58 2014 -0700" }, "message": "resolved conflicts for merge of 47c888a9 to master\n\nChange-Id: I4ba2fdc6374a93a892bb7651b0d174e495f09bf6\n" }, { "commit": "47c888a9fb74f8a46fbf666f0611fd1a9491466f", "tree": "ea7631cdcd94ec77ac39be13ed601cce6da89504", "parents": [ "f38e190887e73bc08735af95b073ebfaabd65f95", "e580aa4a756d1825c440a4b4309022b1babb6de1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 14:51:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 14:51:37 2014 +0000" }, "message": "am e580aa4a: am 86438382: Merge \"When passing a size_t via binder, use 64-bits unconditionally\"\n\n* commit \u0027e580aa4a756d1825c440a4b4309022b1babb6de1\u0027:\n When passing a size_t via binder, use 64-bits unconditionally\n" }, { "commit": "e580aa4a756d1825c440a4b4309022b1babb6de1", "tree": "689e1e7dbd0748d317f8363af7f37090929e9664", "parents": [ "3d9164da1b3d58701e41c78e06839d61ed1b4ff9", "86438382a381eb39ed8da53fbd16cf6730fded6c" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 14:48:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 02 14:48:27 2014 +0000" }, "message": "am 86438382: Merge \"When passing a size_t via binder, use 64-bits unconditionally\"\n\n* commit \u002786438382a381eb39ed8da53fbd16cf6730fded6c\u0027:\n When passing a size_t via binder, use 64-bits unconditionally\n" }, { "commit": "86438382a381eb39ed8da53fbd16cf6730fded6c", "tree": "46cf9cd7ccdf436fe2585e45dfb1998529846caa", "parents": [ "236f8ddd23af92f98f2deae86bf6e6b5c9278857", "e03dd22716e688faa56467561827d9b1ea0c4214" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri May 02 14:45:29 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 02 14:45:29 2014 +0000" }, "message": "Merge \"When passing a size_t via binder, use 64-bits unconditionally\"" }, { "commit": "a6e6c70a3c5403e178741eee20c7742e736c4818", "tree": "05a422073abe20fe7cba9d63b127de2545442254", "parents": [ "1b78c4b1484c7d4c12b9a87329dc8d4b6e8c0c37" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Apr 30 10:19:40 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu May 01 20:21:08 2014 -0700" }, "message": "AwesomePlayer: use PTS for queueBuffer\n\nChange-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718\n" }, { "commit": "1b78c4b1484c7d4c12b9a87329dc8d4b6e8c0c37", "tree": "1012e9c8f9e052a6fc50b0c9e57f5cb866ee60e8", "parents": [ "9747b68530aa65b04751b43bf4ce3385b5d781f9" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Apr 30 11:10:44 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu May 01 20:21:08 2014 -0700" }, "message": "Smooth out AwesomePlayer\n\nUse clock estimator to smooth out audio time stamps.\n\nChange-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6\n" }, { "commit": "9747b68530aa65b04751b43bf4ce3385b5d781f9", "tree": "a831eae301a322089c9b3a333b7672c9af7da0cb", "parents": [ "aa8b569eb652c22821b93a6e543449a52ad21158" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Apr 30 11:10:00 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu May 01 20:21:08 2014 -0700" }, "message": "AwesomePlayer: improve scheduling of video event to hit PTS\n\nChange-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed\n" }, { "commit": "aa8b569eb652c22821b93a6e543449a52ad21158", "tree": "604b9df50b731a31677ad7578a8f2314ffed85ae", "parents": [ "236f8ddd23af92f98f2deae86bf6e6b5c9278857" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Apr 22 16:31:54 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu May 01 20:21:08 2014 -0700" }, "message": "stagefright: add ClockEstimator API and WindowedLinearFitEstimator\n\nChange-Id: I74474c385848a8eab2ac0da7c069510378e2b217\n" }, { "commit": "33ddcb6f1049cb4b6c71bb7ea605375f9492601d", "tree": "bcacaacc4826f9fb40e2acf99cbac5dd65a9bb74", "parents": [ "8710fb4b39e1807a5f2a4486fe0b140129b3618d", "877a0ac7e8677fa1cbd0e8565ad9d38ba0db5fc0" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu May 01 22:53:51 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 01 22:53:52 2014 +0000" }, "message": "Merge \"Use AUDIO_INTERLEAVE_* constants\"" }, { "commit": "8710fb4b39e1807a5f2a4486fe0b140129b3618d", "tree": "a7a9585f998deede697ba6de8353a9727ddbb55f", "parents": [ "88014186c34dbc5c8f4cdf0936cae2a36e4b61ac", "f38e190887e73bc08735af95b073ebfaabd65f95" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu May 01 22:25:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 01 22:25:14 2014 +0000" }, "message": "am f38e1908: am 3d9164da: am 236f8ddd: Merge \"Add missing include\"\n\n* commit \u0027f38e190887e73bc08735af95b073ebfaabd65f95\u0027:\n Add missing include\n" } ], "next": "f38e190887e73bc08735af95b073ebfaabd65f95" }