)]}'
{
  "log": [
    {
      "commit": "a167416289a8aef5d4c35861c9f4181f87b8bfd0",
      "tree": "cfb0b940141a4273ac6ddb58070e36ea706b7358",
      "parents": [
        "9fdd03417041c9db597f2406811ab5d150dc5410",
        "cddb68b5eafbeba696d5276bda1f1a9f70bbde42"
      ],
      "author": {
        "name": "Ethan Yonker",
        "email": "dees_troy@teamw.in",
        "time": "Thu Nov 06 08:35:10 2014 -0600"
      },
      "committer": {
        "name": "Ethan Yonker",
        "email": "dees_troy@teamw.in",
        "time": "Thu Nov 06 08:35:13 2014 -0600"
      },
      "message": "Merge in lollipop and attempt to fix merge conflicts\n\nThis will probably not compile and may need additional work.\nFor tracking purposes so we know what might still need looking at\nas none of this has been compiled and tested, here is a list of\nthe merge conflicts that I attempted to fix before pushing this\nset of changes:\n\ngit pull aosp lollipop-release\nremote: Finding sources: 100% (992/992)\nremote: Total 992 (delta 473), reused 992 (delta 473)\nReceiving objects: 100% (992/992), 1.51 MiB | 516.00 KiB/s, done.\nResolving deltas: 100% (473/473), completed with 42 local objects.\nFrom https://android.googlesource.com/platform/bootable/recovery\n * branch            lollipop-release -\u003e FETCH_HEAD\n * [new branch]      lollipop-release -\u003e aosp/lollipop-release\nAuto-merging verifier_test.cpp\nCONFLICT (content): Merge conflict in verifier_test.cpp\nAuto-merging verifier.h\nCONFLICT (content): Merge conflict in verifier.h\nAuto-merging verifier.cpp\nCONFLICT (content): Merge conflict in verifier.cpp\nAuto-merging updater/updater.c\nAuto-merging updater/install.c\nCONFLICT (content): Merge conflict in updater/install.c\nAuto-merging updater/Android.mk\nCONFLICT (content): Merge conflict in updater/Android.mk\nAuto-merging uncrypt/Android.mk\nCONFLICT (content): Merge conflict in uncrypt/Android.mk\nAuto-merging ui.cpp\nCONFLICT (content): Merge conflict in ui.cpp\nAuto-merging screen_ui.cpp\nAuto-merging roots.cpp\nCONFLICT (content): Merge conflict in roots.cpp\nCONFLICT (rename/delete): res-hdpi/images/progress_fill.png deleted\nin HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42.\nVersion cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of\nres-hdpi/images/progress_fill.png left in tree.\nCONFLICT (rename/delete): res-hdpi/images/progress_empty.png deleted\nin HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42.\nVersion cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of\nres-hdpi/images/progress_empty.png left in tree.\nCONFLICT (rename/delete): res-hdpi/images/icon_error.png deleted\nin HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42.\nVersion cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of\nres-hdpi/images/icon_error.png left in tree.\nAuto-merging recovery.cpp\nCONFLICT (content): Merge conflict in recovery.cpp\nAuto-merging minui/resources.c\nCONFLICT (content): Merge conflict in minui/resources.c\nAuto-merging minui/minui.h\nCONFLICT (content): Merge conflict in minui/minui.h\nAuto-merging minui/graphics.c\nCONFLICT (content): Merge conflict in minui/graphics.c\nAuto-merging minui/Android.mk\nCONFLICT (content): Merge conflict in minui/Android.mk\nRemoving minelf/Retouch.h\nRemoving minelf/Retouch.c\nAuto-merging minadbd/usb_linux_client.c\nCONFLICT (content): Merge conflict in minadbd/usb_linux_client.c\nAuto-merging minadbd/adb.h\nCONFLICT (content): Merge conflict in minadbd/adb.h\nAuto-merging minadbd/adb.c\nCONFLICT (content): Merge conflict in minadbd/adb.c\nAuto-merging minadbd/Android.mk\nCONFLICT (content): Merge conflict in minadbd/Android.mk\nRemoving make-overlay.py\nAuto-merging install.h\nCONFLICT (content): Merge conflict in install.h\nAuto-merging etc/init.rc\nCONFLICT (content): Merge conflict in etc/init.rc\nAuto-merging bootloader.h\nAuto-merging applypatch/applypatch.c\nAuto-merging applypatch/Android.mk\nCONFLICT (content): Merge conflict in applypatch/Android.mk\nAuto-merging adb_install.cpp\nCONFLICT (content): Merge conflict in adb_install.cpp\nAuto-merging Android.mk\nCONFLICT (content): Merge conflict in Android.mk\nAutomatic merge failed; fix conflicts and then commit the result.\n\nChange-Id: I3e0e03e48ad8550912111c7a5c9a140ed0267e2c\n"
    },
    {
      "commit": "cddb68b5eafbeba696d5276bda1f1a9f70bbde42",
      "tree": "bfcb5e87a8cb3e3cc0a860a38d664ce962021148",
      "parents": [
        "a6c142f2a579ea5e7cdfbc88e6a061c55029265a"
      ],
      "author": {
        "name": "Michael Runge",
        "email": "mrunge@google.com",
        "time": "Wed Oct 29 12:42:15 2014 -0700"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@google.com",
        "time": "Wed Oct 29 13:29:40 2014 -0700"
      },
      "message": "Use more aggressive sync writing to applypatch.\n\nWe have seen cases where the boot partition is patched, but upon\nrecovery the partition appears to be corrupted.  Open up all\npatched files/partitions with O_SYNC, and do not ignore the\nerrors from fsync/close operations.\n\nBug: 18170529\nChange-Id: I392ad0a321d937c4ad02eaeea9170be384a4744b\n"
    },
    {
      "commit": "d9201048c487ff528cd1e73583d5105cfa651aab",
      "tree": "18621c3d97738b297c148d8b4f63adcb64ed09a6",
      "parents": [
        "7e22c2760986339e7c1288d0ddc74709908a36b9"
      ],
      "author": {
        "name": "Conn O\u0027Griofa",
        "email": "connogriofa@gmail.com",
        "time": "Tue Mar 25 01:26:49 2014 +0000"
      },
      "committer": {
        "name": "Dees Troy",
        "email": "dees_troy@teamw.in",
        "time": "Tue Oct 07 21:00:29 2014 +0200"
      },
      "message": "applypatch: add support for BML partitions\n\nThis actually uses the EMMC partition access code. In order for this\nto work, the BML partition name is changed back to the block\ndevice name (e.g. \"boot\" -\u003e \"/dev/block/bml9\"), and the\nBML_UNLOCK_ALL ioctl is called before writing.\n\nChange-Id: I012f1eca0b486b7465ca38b5db1f513ee8a246ea\n"
    },
    {
      "commit": "bc7ffeda98a861e346c30c771d3258030f7fcf21",
      "tree": "a435cfd2bd1b457bb2e45304b8e75cd2e1305831",
      "parents": [
        "2efc9d994ce59f9ebfc2290c2adc5d760e8939c2"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Fri Aug 15 14:31:52 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Aug 19 16:53:39 2014 -0700"
      },
      "message": "installer for new block OTA system\n\n(Cherry-pick back from master.)\n\nBug: 16984795\nChange-Id: Ifa3d8345c5e2a0be86fb28faa080ca82592a96b4\n"
    },
    {
      "commit": "679baa06b79e0c9100ce05fa0191928fc2a691fb",
      "tree": "d09a8d683cf713935e395168e403d1fbd61ea971",
      "parents": [
        "679be487206a9f987b553fad081efb455bd28fcf",
        "4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Mar 14 21:35:41 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Mar 14 21:35:41 2014 +0000"
      },
      "message": "am 4b6de1ba: am 026ebe02: Merge \"Recovery 64-bit compile issues\"\n\n* commit \u00274b6de1ba1ce0fff95c18a8abb7ba6e5762006d49\u0027:\n  Recovery 64-bit compile issues\n"
    },
    {
      "commit": "4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49",
      "tree": "8fa1fa41069b4c6991157ac484069121caab9767",
      "parents": [
        "239fb930e4d91de5d3a66997d32d43414055d40e",
        "026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Mar 14 20:59:56 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Mar 14 20:59:56 2014 +0000"
      },
      "message": "am 026ebe02: Merge \"Recovery 64-bit compile issues\"\n\n* commit \u0027026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc\u0027:\n  Recovery 64-bit compile issues\n"
    },
    {
      "commit": "f3bb31c32fa879ccce358c15c93b7bd8582d1756",
      "tree": "0ce9c3520be76db70f29a63fca0b895a028934af",
      "parents": [
        "a7266ef0b1804e3ddeea58bda9a416e807a55f88"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Mar 14 09:39:48 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Mar 14 13:51:39 2014 -0700"
      },
      "message": "Recovery 64-bit compile issues\n\nChange-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34\n"
    },
    {
      "commit": "a1bc148c7c81f886426c253f2ea7beb0f301f6b0",
      "tree": "2ece82d93c5be1f793d8cf1d475dcd5d2cab442a",
      "parents": [
        "52b4036eb820042d0309b32b579c52b63ca58b4d"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Feb 13 15:18:19 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Feb 13 15:18:19 2014 -0800"
      },
      "message": "remove \u0027retouch\u0027 ASLR support\n\nOlder versions of android supported an ASLR system where binaries were\nrandomly twiddled at OTA install time.  Remove support for this; we\nnow use the ASLR support in the linux kernel.\n\nChange-Id: I8348eb0d6424692668dc1a00e2416fbef6c158a2\n"
    },
    {
      "commit": "168724c31ad5241e157ebb35135a734fa075d53b",
      "tree": "2767df1a481624b816eeddce4cc1a1ab6b08b2de",
      "parents": [
        "c87bab101893e8322b49d7c8600e3367b20ab50a"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Dec 19 15:16:57 2013 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Dec 19 15:16:57 2013 -0800"
      },
      "message": "fix unnecessarily slow writing of EMMC partitions\n\nThese were attempts to write partitions \"conservatively\" in hopes of\nfixing the problems with writing the radio partition on Nexus 4.  They\ndidn\u0027t work (a kernel patch was needed), but got left in.  They make\nwriting of partitions unnecessarily slow (ie, we really shouldn\u0027t need\nto sync() after every 4kb).  Roll back most of them, but leave the\nverification read-back in.\n\nChange-Id: I94badc0979e88816c5aa0485f6316c02be69173c\n"
    },
    {
      "commit": "51c84694b0198a90b8eed635b46a3712c44db7a5",
      "tree": "01338c51bd2c2fcb57804e80428fd124298a293e",
      "parents": [
        "bce44d8b550d898ab1893cc0125b18f29534a0ec",
        "a69b50c567d46afad73c4d6ab9e57f078ee73327"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 14:23:44 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jul 11 14:23:44 2013 -0700"
      },
      "message": "am a69b50c5: am 901b898d: recovery: remove O_DIRECT, use O_SYNC only\n\n* commit \u0027a69b50c567d46afad73c4d6ab9e57f078ee73327\u0027:\n  recovery: remove O_DIRECT, use O_SYNC only\n"
    },
    {
      "commit": "bce44d8b550d898ab1893cc0125b18f29534a0ec",
      "tree": "9eb710ee16955473f69c074be49d6f10ee4f912c",
      "parents": [
        "1bdd5b7e744d20854d90cfead752eebcf9cde023",
        "660637f3fc6fe20e8b7f47b98152138c2c92b7ec"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 14:23:36 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jul 11 14:23:36 2013 -0700"
      },
      "message": "am 660637f3: am e8d953aa: recovery: more cargo-cult programming\n\n* commit \u0027660637f3fc6fe20e8b7f47b98152138c2c92b7ec\u0027:\n  recovery: more cargo-cult programming\n"
    },
    {
      "commit": "901b898d5e4d7cc555974b8132f83f948f8fbaee",
      "tree": "41e1a7b19590dda198d6acf6e710bc7ad13720bb",
      "parents": [
        "e8d953aa7ed0c16beb1b03a05d16cb23dd85e198"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 12:31:25 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 12:31:25 2013 -0700"
      },
      "message": "recovery: remove O_DIRECT, use O_SYNC only\n\nO_DIRECT writes fail with EINVAL due to alignment issues.\n\nChange-Id: If8cf38a636313e4f4b4e61e66287dc903c473e5b\n"
    },
    {
      "commit": "e8d953aa7ed0c16beb1b03a05d16cb23dd85e198",
      "tree": "5958ccb6508883c4cf80afb343dd5e3e645978de",
      "parents": [
        "bf4a69ac41696fe78f6cc67b10cf1816186f1c5d"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 12:09:05 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 12:11:11 2013 -0700"
      },
      "message": "recovery: more cargo-cult programming\n\nAdd O_DIRECT|O_SYNC when opening partitions for write.\n\nChange-Id: I9825ad8e60fba87e482f8abc5593d6f54a1e3a1c\n"
    },
    {
      "commit": "65c37aa0d328d7bb13d121bd59ab784361335bd8",
      "tree": "9358cc08c4cc1b3057871428d2c525c1f9709546",
      "parents": [
        "f5edbd107a234e989a6d765046c13293842b66cc",
        "fbcfad33face5d3b9e6b8cb04379168bceb517df"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 10:17:48 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jul 11 10:17:48 2013 -0700"
      },
      "message": "am fbcfad33: am bf4a69ac: recovery: sleep after writing partition and closing it\n\n* commit \u0027fbcfad33face5d3b9e6b8cb04379168bceb517df\u0027:\n  recovery: sleep after writing partition and closing it\n"
    },
    {
      "commit": "5d0da128789c229ef723f21b4f620bde4db9d9d2",
      "tree": "433e32fe24e00622680ed7802908d71d2710ba06",
      "parents": [
        "a4ee1f8b76a11ea3dc31aad6a0d5d1e9f11904e6",
        "2148133d46cb875316b01947dd5719ed995f7d67"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jul 11 10:08:23 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jul 11 10:08:23 2013 -0700"
      },
      "message": "am 2148133d: am c870a99c: recovery: write partitions more conservatively\n\n* commit \u00272148133d46cb875316b01947dd5719ed995f7d67\u0027:\n  recovery: write partitions more conservatively\n"
    },
    {
      "commit": "bf4a69ac41696fe78f6cc67b10cf1816186f1c5d",
      "tree": "3698b1574a9f3875b0a7adb8d8e4c1abb7c78b60",
      "parents": [
        "c870a99c4aeb9e232ee68951e666b5fa670d1680"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 10 13:39:50 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 10 13:46:46 2013 -0700"
      },
      "message": "recovery: sleep after writing partition and closing it\n\nAnother speculative attempt to get everything we write actually stored\nto the device.\n\nChange-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70\n"
    },
    {
      "commit": "c870a99c4aeb9e232ee68951e666b5fa670d1680",
      "tree": "fa17347278bb2b3c013d5834491ce639bb6b1c1a",
      "parents": [
        "044a0b4d49a11edfa13471ce20914b0514eb7e0e"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Jul 09 10:34:46 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Jul 09 10:42:15 2013 -0700"
      },
      "message": "recovery: write partitions more conservatively\n\nWrite and verify partitions using write(2) and read(2) rather than the\nstdio functions.  Read and write in 4kb blocks.  When writing, fsync()\nevery 1MB.\n\nBug: 9602014\nChange-Id: Ie98ce38e857786fc0f4ebf36bb5ffc93b41bc96f\n"
    },
    {
      "commit": "602c4ebd393845f3388aea6ecb0c620580a7f332",
      "tree": "efabd5393792991d30bf8226ec9538339d81cd4e",
      "parents": [
        "573e830b27014ccc8f7c4e0e881279052e5826cf",
        "0ccaccf7d0f50bb9555ee13a841c246a1fea80f2"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Jul 08 14:14:24 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Jul 08 14:14:24 2013 -0700"
      },
      "message": "am 0ccaccf7: am 044a0b4d: recovery: try to write EMMC partitions more reliably\n\n* commit \u00270ccaccf7d0f50bb9555ee13a841c246a1fea80f2\u0027:\n  recovery: try to write EMMC partitions more reliably\n"
    },
    {
      "commit": "044a0b4d49a11edfa13471ce20914b0514eb7e0e",
      "tree": "18a9dd9d0859f251fb4d194816bdf4f3a93d989d",
      "parents": [
        "2f6877a0220475303907203308c018d789ea1a53"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Jul 08 09:42:54 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Jul 08 12:59:22 2013 -0700"
      },
      "message": "recovery: try to write EMMC partitions more reliably\n\nNexus 4 has flash errors that manifest during large writes (eg, of the\nradio partition).  Writes of some blocks seem to be dropped silently,\nwithout any errors being returned to the user level.\n\nMake two changes to the partition-writing code:\n\n- break it up into 1MB writes instead of writing partitions with a\n  single fwrite() call.  Pause for 50ms in between every chunk.\n\n- read the partition back after writing and verify that we read what\n  we wrote.  Drop caches before reading so we (hopefully) are reading\n  off the actual flash and not some cache.\n\nNeither of these should be necessary.\n\nBug: 9602014\n\nChange-Id: Ice2e24dd4c11f1a57968277b5eb1468c772f6f63\n"
    },
    {
      "commit": "bac7fba02763ae5e78e8e4ba0bea727330ad953e",
      "tree": "6056acf572fb45b4ff1ef2874b1d6373776a56c7",
      "parents": [
        "84a6c0d298f0606f7c27857b17115cbd362ad637"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Apr 10 11:32:17 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Apr 10 11:32:17 2013 -0700"
      },
      "message": "verifier: update to support certificates using SHA-256\n\nChange-Id: Ifd5a29d459acf101311fa1c220f728c3d0ac2e4e\n"
    },
    {
      "commit": "bf80f49edcec6b22ad7b1219e6ed6eda1e930c8c",
      "tree": "1f47c641d762aeac482cae331b04f9d4391720fa",
      "parents": [
        "a0d9ddb8f2922088b08219326afeaf532b3af5ac"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Oct 19 12:24:26 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Oct 19 12:24:26 2012 -0700"
      },
      "message": "reduce some recovery logging\n\nMake minzip log only a count of files when extracting, not individual\nfilenames.  Make patching only chatter about free space if there\u0027s not\nenough and compact the other messages.\n\nOnly the last 8k of the recovery log gets uploaded; this makes it more\nlikely that we will get all of it.\n\nChange-Id: I529cb4947fe2185df82b9da5fae450a7480dcecd\n"
    },
    {
      "commit": "a3ccba6d314cb29b02d1dbda9a71427b11da936d",
      "tree": "5f2a722ebb6f9c7d58da206c04e077a7685c646c",
      "parents": [
        "5585025814418e8b692a3a38b7cff495180a74f8"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Aug 20 15:28:02 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Aug 20 15:28:02 2012 -0700"
      },
      "message": "add bonus data feature to imgdiff/imgpatch/applypatch\n\nThe bonus data option lets you give an additional blob of uncompressed\ndata to be used when constructing a patch for chunk #1 of an image.\nThe same blob must be available at patch time, and can be passed to\nthe command-line applypatch tool (this feature is not accessible from\nedify scripts).\n\nThis will be used to reduce the size of recovery-from-boot patches by\nstoring parts of the recovery ramdisk (the UI images) on the system\npartition.\n\nChange-Id: Iac1959cdf7f5e4582f8d434e83456e483b64c02c\n"
    },
    {
      "commit": "956cde8578c40ec812a933a14cb4e82f2c0de320",
      "tree": "4b477b5b9db290ff41f2187a134bc6ecb3e74f61",
      "parents": [
        "ea17e320b0bc4437e8a881026f296b71fa02ad3e"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Tue Jun 26 15:01:03 2012 -0700"
      },
      "committer": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Tue Jun 26 15:01:03 2012 -0700"
      },
      "message": "Add mode when open(O_CREAT) is used.\n\nWhen creating a new file using open(..., O_CREAT), it is an error\nto fail to specify a creation mode. If a mode is not specified, a\nrandom stack provided value is used as the \"mode\".\n\nThis will become a compile error in a future Android change.\n\nChange-Id: I73c1e1a39ca36bf01704b07302af4971d234b5a8\n"
    },
    {
      "commit": "b07b293944c2002a39bbd804f0b6f590ed8458cd",
      "tree": "45aea334fdfc1217d386891a4a795272907614c2",
      "parents": [
        "1c43c9741bc4d9f62f2e3262cea1309890d1bbd2"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Feb 28 12:07:30 2012 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Feb 28 12:07:30 2012 -0800"
      },
      "message": "fix build\n\nChange-Id: I44a75f5451af053778be299b23274ecce9b2db76\n"
    },
    {
      "commit": "1c43c9741bc4d9f62f2e3262cea1309890d1bbd2",
      "tree": "7219a8862de38373611ea429c54b6818e92f90ee",
      "parents": [
        "53013c464552911a17585d1915a87011d2c2abc5"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Feb 28 11:07:09 2012 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Feb 28 11:07:09 2012 -0800"
      },
      "message": "fix failure to free memory\n\nThe applypatch function is somewhat sloppy about freeing memory (since\nit was originally a standalone binary).  Fix some of that.\n\nChange-Id: Ifd44d71ea189c0b5115493119fd57bc37533fd59\n"
    },
    {
      "commit": "baf6e35473ee5d0fd34006cd4f821129845b1d31",
      "tree": "c90d3a848663402c9d77db36088aeb09fa236095",
      "parents": [
        "8101125ee5068aff91f98c042660cb29576b8612",
        "c080bc549aaf272c77fe7903e52c2a2c0d8de1bb"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Aug 16 07:44:51 2010 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Aug 16 07:44:51 2010 -0700"
      },
      "message": "am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declaration\n\nMerge commit \u0027c080bc549aaf272c77fe7903e52c2a2c0d8de1bb\u0027\n\n* commit \u0027c080bc549aaf272c77fe7903e52c2a2c0d8de1bb\u0027:\n  remove shadowed variable declaration\n"
    },
    {
      "commit": "201cd46680f5789e21a57fb4476ab0ba0c0ed4c0",
      "tree": "aba530f55ad47dd1dee46bdb06a1c766a23b8cdd",
      "parents": [
        "8cd9e4f3d4eba481b411482331293c8079ab24b2"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Aug 13 09:41:21 2010 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Aug 13 09:41:21 2010 -0700"
      },
      "message": "remove shadowed variable declaration\n\nAn accidental variable declaration (\"int enough_space \u003d ...\" instead\nof \"enough_space \u003d \" inside a block) shadowing the real one meant we\nwere always using the copy-to-cache path for patching, even when not\nnecessary.  Remove it.  Enforce an absolute minimum of free space as\nwell, to avoid running into problems patching small files, now that\nthe copy-to-cache path is (inadvertently) well-tested.\n\nChange-Id: Idb7d57241a9adcda2e11001fa44f0cd67ce40d19\n"
    },
    {
      "commit": "80dcee145ff6aa734b611133ef98045f940cf82c",
      "tree": "ac9f88b6c72f7e29f86a773a62150f46bd5815d3",
      "parents": [
        "04611da55b13f9697173d3aa947b3a735b96c01f",
        "c4e3200578ad670bee9f5a88e90e7a77089d5df7"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Aug 12 17:57:45 2010 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 12 17:57:45 2010 -0700"
      },
      "message": "am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patches\n\nMerge commit \u0027c4e3200578ad670bee9f5a88e90e7a77089d5df7\u0027\n\n* commit \u0027c4e3200578ad670bee9f5a88e90e7a77089d5df7\u0027:\n  fix bug in applying patches\n"
    },
    {
      "commit": "8cd9e4f3d4eba481b411482331293c8079ab24b2",
      "tree": "647cad0b12c6afef6013cc333eacf1e7d2abd5c2",
      "parents": [
        "ecc76ba5516d62a886f9c290906e0ca50702c9ab"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Aug 12 17:38:09 2010 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Aug 12 17:38:09 2010 -0700"
      },
      "message": "fix bug in applying patches\n\nWhen restarting a patch from crashing in the middle of a large file,\nwe\u0027re not finding the correct patch to apply to the copy saved in\ncache.\n\nChange-Id: I41cb2b87d096bb7a28a10c4cf3902facd45d4c9d\n"
    },
    {
      "commit": "db314d69f023d2a6c8956073aa9d283e20b280ef",
      "tree": "8d076d8b94464e1173b2b5dbf3f2ee419a1d7fa9",
      "parents": [
        "f635d2e91006028afa8b0fc53f80e5c157c495e6"
      ],
      "author": {
        "name": "Hristo Bojinov",
        "email": "hristo@google.com",
        "time": "Mon Aug 02 10:29:49 2010 -0700"
      },
      "committer": {
        "name": "Hristo Bojinov",
        "email": "hristo@google.com",
        "time": "Mon Aug 02 14:17:33 2010 -0700"
      },
      "message": "Working ASLR implementation\n\nSeparate files for retouch functionality are in minelf/*\n\nASLR for shared libraries is controlled by \"-a\" in ota_from_target_files.\nBinary files are self-contained. Retouch logic can recover from crashes.\n\nSigned-off-by: Hristo Bojinov \u003christo@google.com\u003e\nChange-Id: I76c596abf4febd68c14f9d807ac62e8751e0b1bd\n"
    },
    {
      "commit": "f291d858f8c9bf40051d50adfd10e758aa222315",
      "tree": "169ee8b6d18727cc6db1cfe89a2ed0d6b31c8b12",
      "parents": [
        "3d177d055c9cf3571e4b7c098818b454d1dbf9d7"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 07 13:55:25 2010 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 07 15:18:27 2010 -0700"
      },
      "message": "EMMC support in applypatch\n\nLet applypatch read and write EMMC partitions as well as MTD ones.\nThis enables incremental updates that include boot image changes, as\nwell as OTA of new recovery partitions.\n\nChange-Id: I3766b9e77c639769ddf693b675da51d57f6e6b1d\n"
    },
    {
      "commit": "c4351c791052ad529a4e83c600b1aa6e6420ea86",
      "tree": "cdc534868eb58ea980bcca2fbc8e04b68fd9936c",
      "parents": [
        "583fc12c3dbe09e3a9b759b9466c505b006e6a39"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Feb 22 14:46:32 2010 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Feb 22 15:30:33 2010 -0800"
      },
      "message": "refactor applypatch and friends\n\nChange the applypatch function to take meaningful arguments instead of\nargc and argv.  Move all the parsing of arguments into main.c (for the\nstandalone binary) and into install.c (for the updater function).\napplypatch() takes patches as Value objects, so we can pass in blobs\nextracted from the package without ever writing them to temp files.\n\nThe patching code is changed to read the patch from memory instead of\na file.\n\nA bunch of compiler warnings (mostly about signed vs unsigned types)\nare fixed.\n\nSupport for the IMGDIFF1 format is dropped.  (We\u0027ve been generating\nIMGDIFF2 packages for some time now.)\n\nChange-Id: I217563c500012750f27110db821928a06211323f\n"
    },
    {
      "commit": "512536a54a1a211a9f582e76cbf12850dc7d5466",
      "tree": "724012f5ea1a3053adecb512baf342490bb94d02",
      "parents": [
        "21854ccdb250e6e81311b4317934e8c953b252a8"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Feb 17 16:11:44 2010 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Feb 18 14:22:12 2010 -0800"
      },
      "message": "relocate applypatch; add type system and new functions to edify\n\n- Move applypatch to this package (from build).\n\n- Add a rudimentary type system to edify:  instead of just returning a\n  char*, functions now return a Value*, which is a struct that can\n  carry different types of value (currently just STRING and BLOB).\n  Convert all functions to this new scheme.\n\n- Change the one-argument form of package_extract_file to return a\n  Value of the new BLOB type.\n\n- Add read_file() to load a local file and return a blob, and\n  sha1_check() to test a blob (or string) against a set of possible\n  sha1s.  read_file() uses the file-loading code from applypatch so it\n  can read MTD partitions as well.\n\nThis is the start of better integration between applypatch and the\nrest of edify.\n\nb/2361316 - VZW Issue PP628: Continuous reset to Droid logo:\n            framework-res.apk update failed (CR LIBtt59130)\n\nChange-Id: Ibd038074749a4d515de1f115c498c6c589ee91e5\n"
    }
  ]
}
