)]}'
{
  "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": "031163b2c6a6bf7fbcc56c2435222c2053c232ba",
      "tree": "8616358a85fe0d7cf846b367e5813b8a9991ad8d",
      "parents": [
        "b53fcaa35f2f4785cda16382973434657f3e34fc"
      ],
      "author": {
        "name": "Matt Mower",
        "email": "mowerm@gmail.com",
        "time": "Sat Nov 01 15:13:03 2014 -0500"
      },
      "committer": {
        "name": "Ethan Yonker",
        "email": "dees_troy@teamw.in",
        "time": "Mon Nov 03 13:36:03 2014 -0600"
      },
      "message": "Remove dependence on build hax in makefiles\n\nUpdate makefiles to no longer rely on INTERNAL_RECOVERY_FILES. Define\nLOCAL_ADDITIONAL_DEPENDENCIES instead.\n\nSet LOCAL_LDFLAGS to properly link recovery executable.\n\nChange-Id: I4542104c69399b5a19674b9772ab89c3709efa72\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": "55c75cad80479f35928f20fba7dcfbc3aec9994e",
      "tree": "c62fafb9c4f2039e253a4c41d783ee89c6e43772",
      "parents": [
        "298c4387f7ce8d7488e20792a8e8201a871d4a2b"
      ],
      "author": {
        "name": "Matt Mower",
        "email": "mowerm@gmail.com",
        "time": "Sun Aug 31 11:30:15 2014 -0500"
      },
      "committer": {
        "name": "Ethan Yonker",
        "email": "dees_troy@teamw.in",
        "time": "Wed Sep 03 10:53:37 2014 -0500"
      },
      "message": "Build block TWRP with RECOVERY_VARIANT\n\nEnable TWRP to reside alongside other recoveries with the naming\nconvention: bootable/recovery(-flag). If TWRP resides at\nbootable/recovery and a device does not specify RECOVERY_VARIANT, then\nit will build like normal. If TWRP resides at bootable/recovery-twrp,\nthen its makefiles will only be parsed if a device specifies\n\u0027RECOVERY_VARIANT :\u003d twrp\u0027. This prevents TWRP specific makefile\nwarnings/errors (notably, missing DEVICE_RESOLUTION) when another\nrecovery is being built.\n\nChange-Id: I8f02fffcd79c309c7123b9428eedc69af02e126e\n"
    },
    {
      "commit": "3eb681d1de4eb0a4807e851c323568ed3f360381",
      "tree": "9aef40f2ffc581ef0b93140e859aa44dc82799f7",
      "parents": [
        "a1bc148c7c81f886426c253f2ea7beb0f301f6b0"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Feb 13 15:49:35 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Feb 13 15:49:35 2014 -0800"
      },
      "message": "remove remaining libminelf references\n\nChange-Id: Id38b08607829bccc031693cc03e60e849903b6f8\n"
    },
    {
      "commit": "d63c7643fd7749de1723ce1adc5907fed1c1a11c",
      "tree": "e849392b599e13df8d6b3c82ba562a8f50ca94fb",
      "parents": [
        "ce8d8931cecf7f6a7a2241474e10581af2f8483a"
      ],
      "author": {
        "name": "Dees Troy",
        "email": "dees_troy@teamw.in",
        "time": "Sun Nov 03 13:03:55 2013 +0000"
      },
      "committer": {
        "name": "Dees Troy",
        "email": "dees_troy@teamw.in",
        "time": "Sun Nov 03 13:06:10 2013 +0000"
      },
      "message": "Fix building of other utilities\n\nFix building all applypatch items\nFix building verifier_test (probably will not work right as-is)\nbut at least it builds without errors.\n\nChange-Id: I7ab0c04d7d3d2c2e14b57480627e594f89a68b0b\n"
    },
    {
      "commit": "51a0e82eb29a6dfc79f93479883383fbdbf8bcc2",
      "tree": "52fc18206eb0feba9f50dc3b0ede9fdc5e40f35e",
      "parents": [
        "240e4a72474842067e7546936be7b7237c2ee236"
      ],
      "author": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Wed Sep 05 15:24:24 2012 -0400"
      },
      "committer": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Wed Sep 05 15:24:31 2012 -0400"
      },
      "message": "TWRP-ify AOSP code\n\nPull in most TWRP sources\nStub out partition management code\nMake it compile -- probably will not boot\nKind of a mess but have to start somewhere\n"
    },
    {
      "commit": "fc417fc4c4edcf49fc1e6d2cc95c2c7f381629cd",
      "tree": "3336d0f60abc53a3d5d18477e4301d08ece70b80",
      "parents": [
        "a23075fb0e23978e5b8f3a7c92280ee1b2274e6d"
      ],
      "author": {
        "name": "Joe Onorato",
        "email": "joeo@google.com",
        "time": "Fri May 18 20:03:43 2012 -0700"
      },
      "committer": {
        "name": "Joe Onorato",
        "email": "joeo@google.com",
        "time": "Tue Aug 14 12:52:53 2012 -0700"
      },
      "message": "host modules don\u0027t need LOCAL_MODULE_TAGS\n\nChange-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137\n"
    },
    {
      "commit": "c0481af40604b8a83ff2ddfbc04b37045c7fa228",
      "tree": "40896df3106c947a711c7e669181e65805a9fc95",
      "parents": [
        "dd6cd4fcc1b22df7f55e1ab3e54589939dc54179"
      ],
      "author": {
        "name": "Joe Onorato",
        "email": "joeo@google.com",
        "time": "Fri May 18 20:03:43 2012 -0700"
      },
      "committer": {
        "name": "Joe Onorato",
        "email": "joeo@google.com",
        "time": "Sat Jul 21 15:24:56 2012 -0700"
      },
      "message": "host modules don\u0027t need LOCAL_MODULE_TAGS\n\nChange-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137\n"
    },
    {
      "commit": "b0462e6ae2338f1fa7cc0ed7aa36887713185a15",
      "tree": "5ce08a548af28accf17e900ffcd2831b405c5470",
      "parents": [
        "933487868f15f3f380efd71dcd0b7c3b744a73d6"
      ],
      "author": {
        "name": "Jeff Brown",
        "email": "jeffbrown@google.com",
        "time": "Mon Jul 11 22:11:45 2011 -0700"
      },
      "committer": {
        "name": "Jeff Brown",
        "email": "jeffbrown@google.com",
        "time": "Mon Jul 11 22:11:45 2011 -0700"
      },
      "message": "Remove the simulator target from all makefiles.\nBug: 5010576\n\nChange-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c\n"
    },
    {
      "commit": "4c05d9511298d24b49ab595814fc9f1894cf6a90",
      "tree": "3c92e5982f7ffd5dd77ff6a87060c1ca8ef94c38",
      "parents": [
        "6da1abbc387d51eb795628fb690d333f10f28408"
      ],
      "author": {
        "name": "Ying Wang",
        "email": "wangying@google.com",
        "time": "Tue Feb 08 19:51:07 2011 -0800"
      },
      "committer": {
        "name": "Ying Wang",
        "email": "wangying@google.com",
        "time": "Tue Feb 08 19:51:07 2011 -0800"
      },
      "message": "Fix x86 build.\n\nChange-Id: Iada6268b0a72ee832113ea397334cc7950a37051\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": "97ca48e7f4ac8d3842f74f92b8f40d0e74733f38",
      "tree": "0b138d617caf108eb94b1e15f67cd95822eb040c",
      "parents": [
        "2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d"
      ],
      "author": {
        "name": "Bruce Beare",
        "email": "brucex.j.beare@intel.com",
        "time": "Wed Apr 28 14:12:52 2010 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon May 03 15:58:50 2010 -0700"
      },
      "message": "generic_x86 support\n\nAdd in Makefiles and support files for x86 builds\n  Based on changes by: wonjong.lee \u003cwonjong.lee@windriver.com\u003e\n  Additional changes by: Mark Gross \u003cmark.gross@intel.com\u003e\n  Additional changes by: Bruce Beare \u003cbrucex.j.beare@intel.com\u003e\n\nChange-Id: I71fcf58f116e4e9047e7d03fdb28e3308553ce5c\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"
    }
  ]
}
