)]}'
{
  "log": [
    {
      "commit": "26860098e8716628f15422af268c5186c76c1b1b",
      "tree": "e21e8b799369e535f4a112783919aae079b3a35b",
      "parents": [
        "6029e934f4ed229a3a92a2df76cbf87e394ed69b"
      ],
      "author": {
        "name": "Ethan Yonker",
        "email": "dees_troy@teamw.in",
        "time": "Thu Nov 06 09:49:25 2014 -0600"
      },
      "committer": {
        "name": "Ethan Yonker",
        "email": "dees_troy@teamw.in",
        "time": "Thu Nov 06 09:49:25 2014 -0600"
      },
      "message": "Fix up libaosprecovery\n\nChange-Id: I5a6d0c3c5f9a3a474464c0f06d6b09045459eebb\n"
    },
    {
      "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": "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": "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": "99916f0496cfe37891d40f21a9a0e387620a8a60",
      "tree": "6b457a65cfdf482fec027386fcd7d197586c67b2",
      "parents": [
        "0708239c003a1537c9cbf98dea5a490955d667aa"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Jan 13 14:16:58 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jan 16 13:29:28 2014 -0800"
      },
      "message": "do verification and extraction on memory, not files\n\nChanges minzip and recovery\u0027s file signature verification to work on\nmemory regions, rather than files.\n\nFor packages which are regular files, install.cpp now mmap()s them\ninto memory and then passes the mapped memory to the verifier and to\nthe minzip library.\n\nSupport for files which are raw block maps (which will be used when we\nhave packages written to encrypted data partitions) is present but\nlargely untested so far.\n\nBug: 12188746\nChange-Id: I12cc3e809834745a489dd9d4ceb558cbccdc3f71\n"
    },
    {
      "commit": "bb4c0cbc4bdbff65e3c997bc5bd0ad6d6afa19d6",
      "tree": "9c28e5243024d0755d15e981a21f2fbb35a41ead",
      "parents": [
        "3be70a897e563658736b2dec3a9ea2697b69b225",
        "91321f60ae3ac485ae63284a2121c728c8b52b95"
      ],
      "author": {
        "name": "Dees Troy",
        "email": "dees_troy@teamw.in",
        "time": "Sat Nov 02 20:25:14 2013 +0000"
      },
      "committer": {
        "name": "Dees Troy",
        "email": "dees_troy@teamw.in",
        "time": "Sat Nov 02 20:43:26 2013 +0000"
      },
      "message": "Fix merge conflicts and update for 4.4 kitkat\n\nMake a copy of libmincrypt in TWRP source so we do not have to\nifdef verifier.cpp for various versions of mincrypt.\n\nRemove reboot tool from toolbox (it was removed from 4.4 and did\nnot compile properly on some devices in older trees)\n"
    },
    {
      "commit": "7a4adb5268ae71260c86788ccdeb7a699c80ee0a",
      "tree": "da4a744e642f5014c3a1085097590bd4a5997f1c",
      "parents": [
        "58c60900ac3682fab08f64373bdd1020713b48f7"
      ],
      "author": {
        "name": "Kenny Root",
        "email": "kroot@google.com",
        "time": "Wed Oct 09 10:14:35 2013 -0700"
      },
      "committer": {
        "name": "Kenny Root",
        "email": "kroot@google.com",
        "time": "Thu Oct 10 14:19:19 2013 -0700"
      },
      "message": "Add support for ECDSA signatures\n\nThis adds support for key version 5 which is an EC key using the NIST\nP-256 curve parameters. OTAs may be signed with these keys using the\nECDSA signature algorithm with SHA-256.\n\nChange-Id: Id88672a3deb70681c78d5ea0d739e10f839e4567\n"
    },
    {
      "commit": "30362a6ad132cbafde82cc57293e00679d4f86c2",
      "tree": "47f9585d4cd72de8a3fb935d8e8387763ce3a9b1",
      "parents": [
        "5c4e1dac0bd8f31559bd50eec4343b7a17b7a976"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Apr 10 11:32:17 2013 -0700"
      },
      "committer": {
        "name": "Kenny Root",
        "email": "kroot@google.com",
        "time": "Wed Sep 25 10:11:46 2013 -0700"
      },
      "message": "verifier: update to support certificates using SHA-256\n\n(cherry picked from commit bac7fba02763ae5e78e8e4ba0bea727330ad953e)\n\nChange-Id: I01c38d7fea088622a8b0bbf2c833fa2d969417af\n"
    },
    {
      "commit": "1669f89dd288e2ba226233a7fd62ea78ddb473c1",
      "tree": "e6d72d724b31b6fa72e6d273a9c6c8661d5c9c2c",
      "parents": [
        "1dc3098a5c976c8bb697a90a2efb10ab2c9049f4",
        "5c4e1dac0bd8f31559bd50eec4343b7a17b7a976"
      ],
      "author": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Wed Sep 04 18:35:08 2013 +0000"
      },
      "committer": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Wed Sep 04 19:00:58 2013 +0000"
      },
      "message": "Update to latest AOSP master\n\nMerge in latest commits from AOSP master and fix merge conflicts\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": "2673cec07a4740f86438b50cfe1b70b258a9a8c8",
      "tree": "3133d98e33eba4fab9760f9a4a54aeac83107119",
      "parents": [
        "a13d74fc95324c4318fcc95956b07fe593669412"
      ],
      "author": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Tue Apr 02 20:22:16 2013 +0000"
      },
      "committer": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Thu Apr 04 18:57:34 2013 +0000"
      },
      "message": "Move all AOSP code out of recovery binary\n\nImproves license compatibility between GPL and Apache\n\nChange-Id: I2b165aa575bb6213af6b07936f99610c113443f0\n"
    },
    {
      "commit": "6c249f7ae890694f061bfde7a3ab52bf367be110",
      "tree": "15652db30bd69d6ee35210f48e65943767958003",
      "parents": [
        "bf80f49edcec6b22ad7b1219e6ed6eda1e930c8c"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Nov 02 15:04:05 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Nov 02 15:09:57 2012 -0700"
      },
      "message": "move key loading to verifier code\n\nAdd an option to verifier_test to load keys from a file, the way the\nrecovery does.\n\nChange-Id: Icba0e391164f2c1a9fefeab4b0bcb878e91d17b4\n"
    },
    {
      "commit": "211aebc4e09ce7ca37003be4f01c83111cf0bb49",
      "tree": "395aa8bc2d1d0412a52d42a3bb2d75a54f96685c",
      "parents": [
        "0890a0ce8ecc47afb1f892dcd770e8dc519add14"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Oct 28 15:13:10 2011 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Oct 31 14:15:02 2011 -0700"
      },
      "message": "refactor ui functions into a class\n\nMove all the functions in ui.c to be members of a ScreenRecoveryUI\nclass, which is a subclass of an abstract RecoveryUI class.  Recovery\nthen creates a global singleton instance of this class and then invoke\nthe methods to drive the UI.  We use this to allow substitution of a\ndifferent RecoveryUI implementation for devices with radically\ndifferent form factors (eg, that don\u0027t have a screen).\n\nChange-Id: I76bdd34eca506149f4cc07685df6a4890473f3d9\n"
    },
    {
      "commit": "28ce47cfa6919518a8c298088bf08b03bb374c0f",
      "tree": "0c429bcc8f4a1935f3be97d87ebdc2f4434ee887",
      "parents": [
        "d0181b8fcdac761afec252151a8bfda116916e96"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Oct 28 10:33:05 2011 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Oct 31 10:24:09 2011 -0700"
      },
      "message": "turn recovery into a C++ binary\n\nChange-Id: I423a23581048d451d53eef46e5f5eac485b77555\n"
    },
    {
      "commit": "4762633cf846d17516878303502b056b52353a5d",
      "tree": "4f5ad826c7bc5d71f8c385d3a31fc009f71549c4",
      "parents": [
        "6e4472abbd3c7be9cd31d98a03df1e3b6fa92f40"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Mar 15 12:11:08 2011 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Mar 15 12:11:08 2011 -0700"
      },
      "message": "log which key a package verified against in recovery\n\nChange-Id: I0d91b715d1eb9e45e2fce54bb93ba0abef92727e\n"
    },
    {
      "commit": "73ae31ce0ac09c0e45924d817644261c87ab1a60",
      "tree": "532c9d372ba61216f1e8b2f6673db11e44174935",
      "parents": [
        "9acf28a390aab3e0f394c701bc3cda6cbc9393b3"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Dec 09 17:01:45 2009 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Dec 09 17:01:45 2009 -0800"
      },
      "message": "add a simple unit test for the OTA package verifier\n"
    },
    {
      "commit": "c652e41d9173e299a8e1805ae1b2bba75a34ae12",
      "tree": "46a2bc479e4982263bf08635e1e43f3f1b61b623",
      "parents": [
        "54ec81fe86225d5f3ee3ab16e3266ae88cd639fa"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Dec 08 15:30:09 2009 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Dec 08 15:30:09 2009 -0800"
      },
      "message": "fix cut-and-paste error in verifier\n\nOops.\n"
    },
    {
      "commit": "54e2e86c5740a2c7a02e95e94c4aff362a5502cf",
      "tree": "42fdf22f18dc4097c2f86cbd691fe6b1c8bd3820",
      "parents": [
        "0cf0e33b5fdb6eb871b64f5325ccd54339f62f01"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Aug 17 13:21:04 2009 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Aug 17 13:21:04 2009 -0700"
      },
      "message": "do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch\n"
    },
    {
      "commit": "c24a8e688a6312764254beac2b2520bb0c5e998d",
      "tree": "7df23711566b358047301d8413ee399105546e8b",
      "parents": [
        "ffb48f64fec674c6dd923eb8b1eb3f743e05a8ba"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 19:28:42 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 19:28:42 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@135843\n"
    },
    {
      "commit": "ffb48f64fec674c6dd923eb8b1eb3f743e05a8ba",
      "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
      "parents": [
        "d4ae69739ebb67374d62229829df07bf2de85103"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 18:28:14 2009 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Mar 03 18:28:14 2009 -0800"
      },
      "message": "auto import from //depot/cupcake/@135843\n"
    },
    {
      "commit": "ff3d93821e22588ce607c17252334ca2d9ca54a4",
      "tree": "e806acbb6f71dbdafc09df3bc0d8a0a4ae1b7905",
      "parents": [
        "23580ca27a0a8109312fdd36cc363ad1f4719889"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 17 18:03:49 2008 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 17 18:03:49 2008 -0800"
      },
      "message": "Code drop from //branches/cupcake/...@124589\n"
    },
    {
      "commit": "23580ca27a0a8109312fdd36cc363ad1f4719889",
      "tree": "0bb90eaa72f8df110162499f756b5cbfb7d49235",
      "parents": [],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Oct 21 07:00:00 2008 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Oct 21 07:00:00 2008 -0700"
      },
      "message": "Initial Contribution\n"
    }
  ]
}
