)]}'
{
  "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": "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": "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": "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": "7c3ae45ef9306d2ff4b491e0488c8849bf15ce90",
      "tree": "1fe30d8091a86909ed9705ea6983a1b051a07620",
      "parents": [
        "4e21482d979f6f81b34f92e664adf137555d4504"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue May 14 11:03:02 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue May 21 11:18:38 2013 -0700"
      },
      "message": "recovery: turn on text display for install errors in debug builds\n\nHopefully this will reduce the number of OTA \"bugs\" reported that are\nreally just someone having changed their system partition,\ninvalidating future incremental OTAs.\n\nAlso fixes a longstanding TODO about putting LOGE() output in the\non-screen display.\n\nChange-Id: I44e5be65b2dee7ebce2cce28ccd920dc3d6e522e\n"
    },
    {
      "commit": "596b342a0476629badb41b840494254a19c57dae",
      "tree": "3aab0c59d51a4a5bef461a476f635ee51bbf3495",
      "parents": [
        "c7a6858dc9d4e75c9c889890902141c4243228a7"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue May 14 11:03:02 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu May 16 10:47:02 2013 -0700"
      },
      "message": "recovery: turn on text display for install errors in debug builds\n\nHopefully this will reduce the number of OTA \"bugs\" reported that are\nreally just someone having changed their system partition,\ninvalidating future incremental OTAs.\n\nAlso fixes a longstanding TODO about putting LOGE() output in the\non-screen display.\n\nChange-Id: I44e5be65b2dee7ebce2cce28ccd920dc3d6e522e\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": "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": "17495277b1a6328f5cae68523ad00be1f1107950",
      "tree": "1f24ec32e8d3cb586c2514180eeff4a539f5d8df",
      "parents": [
        "aade2e590e17b0f47dbf554f7df5824ba4096212"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 25 13:10:58 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 25 13:10:58 2012 -0700"
      },
      "message": "support version 2 (2048-bit e\u003d65537) keys in recovery\n\nChange-Id: I9849c69777d513bb12926c8c622d1c12d2da568a\n"
    },
    {
      "commit": "32a0a47a596509792fde8cdbf8b4b0705708b2be",
      "tree": "55406d412c0a355dc4bdcc3fc0f2136a68af77d3",
      "parents": [
        "daefc1d442fb421606680feb9aeb59c133f4c427"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Nov 01 11:00:20 2011 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Nov 04 14:09:48 2011 -0700"
      },
      "message": "move key processing to RecoveryUI\n\nMove the key for handling keys from ScreenRecoveryUI to RecoveryUI, so\nit can be used by devices without screens.  Remove the UIParameters\nstruct and replace it with some new member variables in\nScreenRecoveryUI.\n\nChange-Id: I70094ecbc4acbf76ce44d5b5ec2036c36bdc3414\n"
    },
    {
      "commit": "daefc1d442fb421606680feb9aeb59c133f4c427",
      "tree": "71b64ebdd66540aca7a523c73a47626ca519d039",
      "parents": [
        "b88aea8a89f9d3344022cdfe895397baac6c05e7"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Oct 31 09:34:15 2011 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Oct 31 15:51:07 2011 -0700"
      },
      "message": "C++ class for device-specific code\n\nReplace the device-specific functions with a class.  Move some of the\nkey handling (for log visibility toggling and rebooting) into the UI\nclass.  Fix up the key handling so there is less crosstalk between the\nimmediate keys and the queued keys (an increasing annoyance on\nbutton-limited devices).\n\nChange-Id: I698f6fd21c67a1e55429312a0484b6c393cad46f\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": "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"
    }
  ]
}
