)]}'
{
  "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": "c87bab101893e8322b49d7c8600e3367b20ab50a",
      "tree": "7fb05cb6389b181776b4ae818e2c0883dd1a9a79",
      "parents": [
        "c64e76c75088b951f61a7f7bacf8af6eccd2ccfa"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Nov 25 13:53:25 2013 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Nov 26 15:46:57 2013 -0800"
      },
      "message": "add the functions for multi-stage packages to updater\n\nIn order to support multi-stage recovery packages, we add the\nset_stage() and get_stage() functions, which store a short string\nsomewhere it can be accessed across invocations of recovery.  We also\nadd reboot_now() which updater can invoke to immediately reboot the\ndevice, without doing normal recovery cleanup.  (It can also choose\nwhether to boot off the boot or recovery partition.)\n\nIf the stage string is of the form \"#/#\", recovery\u0027s UI will be\naugmented with a simple indicator of what stage you\u0027re in, so it\ndoesn\u0027t look like a reboot loop.\n\nChange-Id: I62f7ff0bc802b549c9bcf3cc154a6bad99f94603\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": "a449a6f504ca0cd6f900327af4f91b016a352cd0",
      "tree": "9cfc592467d87d84e4c0cce9967fa8ab75357c16",
      "parents": [
        "66fc8b5887430b6779fe602aa4de46663f981c9e"
      ],
      "author": {
        "name": "Dees_Troy",
        "email": "dees_troy@yahoo.com",
        "time": "Sun Apr 07 17:50:11 2013 -0500"
      },
      "committer": {
        "name": "Dees_Troy",
        "email": "dees_troy@yahoo.com",
        "time": "Sun Apr 07 17:53:34 2013 -0500"
      },
      "message": "Fix handling of AOSP recovery commands\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": "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": "e08991e02a7d678f2574e85289a34b2a9a537c82",
      "tree": "ca53b4adbf66388805a47f93c440412be552761c",
      "parents": [
        "93dbe07ff6c06e8df2c804cbac63601fbb1de041"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Feb 02 13:09:52 2010 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Feb 03 09:20:07 2010 -0800"
      },
      "message": "bump updater API version to 3; deprecate firmware update command\n\nRemove support for the HTC-specific \"firmware\" update command and the\ncorresponding edify function write_firmware_update().  This\nfunctionality is now done by an edify extension library that lives in\nvendor/htc.\n\nChange-Id: I80858951ff10ed8dfff98aefb796bef009e05efb\n"
    },
    {
      "commit": "687bc12ccfbda26ad134b27d09d1d70a2b8705a6",
      "tree": "83d313c1cb3e9a3a6795faeceb832cfd1f423870",
      "parents": [
        "883b4c8be5f50cde679cdfa589d7ade83c0253b7"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jan 20 16:34:10 2010 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jan 21 12:50:04 2010 -0800"
      },
      "message": "save the recovery log from before HTC firmware updates\n\nWhen doing a firmware (radio or hboot) update on HTC devices, save the\nrecovery log in block 1 of the cache partition, before the firmware\nimage and the UI bitmaps.  When we boot back into recovery after the\nfirmware update to reformat the cache partition, copy that log out of\ncache before reformatting it and dump it into the current invocation\u0027s\nlog.\n\nThe practical upshot of all this is that we can see the log output\nfrom radio and hboot updates.\n\nChange-Id: Ie0e89566754c88f4bed6a90d8a0aa04047b01a27\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": "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"
    }
  ]
}
