)]}'
{
  "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": "574443d8956802f35347cac7fae7eb16240e3c16",
      "tree": "02693ba08f06ce5d1420c206abb6e7ce85ef1d84",
      "parents": [
        "40482ea2ae5ca8cbcf46125f601c0bc766f99943"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Fri Sep 05 08:22:12 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Fri Sep 05 08:22:12 2014 -0700"
      },
      "message": "create block map for all update packages on /data\n\nAlways create the block map for packages on /data; don\u0027t only look at\nthe encryptable/encrypted flags.\n\nBug: 17395453\nChange-Id: Iaa7643a32898328277841e324305b9419a9e071c\n"
    },
    {
      "commit": "f449db2f30235a0c2fef4bc7bc41776e271a60a0",
      "tree": "394c53ac4748ac92ee74019cf9a0d79e03374cc0",
      "parents": [
        "1d5d6098f4a470bc8e56ae8914180041815e6e22"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Aug 26 09:15:08 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Aug 26 09:22:57 2014 -0700"
      },
      "message": "open misc device in write-only mode\n\nOpening the misc block device in read-write mode runs afoul of\nSELinux, which keeps the wipe code from working.  Fix.  Also change\nvarious things to log to logcat so we can see them happening, for\nfuture debugging.\n\nBug: 16715412\nChange-Id: Ia14066f0a371cd605fcb544547b58a41acca70b9\n"
    },
    {
      "commit": "2efc9d994ce59f9ebfc2290c2adc5d760e8939c2",
      "tree": "04091cb1c42549e8c4a91e4a23202b5a7b3f2f67",
      "parents": [
        "1a35a586904cd429fd3a6a6c2de64a16ccdf693d"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Aug 18 15:55:28 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Aug 18 15:55:28 2014 -0700"
      },
      "message": "clear BCB in misc partition before rebooting\n\nSomething is leaving behind wipe commands in the BCB area of the /misc\npartition.  We don\u0027t know what is doing that.  It should always be\nsafe to zero out that area from uncrypt, though (because if uncrypt is\nrunning then it\u0027s got the command we want in the recovery command file\nrather than the BCB).\n\nBug: 16715412\nChange-Id: Iad01124287f13b80ff71d6371db6371f43c43211\n"
    },
    {
      "commit": "1a35a586904cd429fd3a6a6c2de64a16ccdf693d",
      "tree": "3334264f208f42ad3ac5df8e086a67da4d4b5849",
      "parents": [
        "537d34f907a5e984ccad1c88825adc8ae9814834"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Aug 14 10:29:54 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Aug 14 10:32:46 2014 -0700"
      },
      "message": "revert uncrypt back to dynamic linking, fix libs\n\nBug: 17029174, 17015157\nChange-Id: I1d24f3402875dfb972daa6daef0f385baeff84e9\n"
    },
    {
      "commit": "537d34f907a5e984ccad1c88825adc8ae9814834",
      "tree": "05f62909030d72ddbf31a5cbf30304845029ba1e",
      "parents": [
        "9dc71cfa5233789a50d8a9d2c9af87d0f106d4ad"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Aug 14 07:59:28 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Aug 14 08:01:17 2014 -0700"
      },
      "message": "change uncrypt to static linking\n\nBug: 17015157\nChange-Id: I3c4bdcf4f11d44b617bb731a48413e3707044d1c\n"
    },
    {
      "commit": "eaf33654c1817bd665831a13c5bd0c04daabee02",
      "tree": "704c52c8d0a1f1ccf3783c495a43a252cdbd468c",
      "parents": [
        "a91ecc59b2753a3dcc93b2619559a980074e77bd"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Jul 31 14:59:01 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Jul 31 15:42:13 2014 -0700"
      },
      "message": "only do uncryption on packages in /data\n\nIf recovery is invoked with a package somewhere other than /data,\nleave it alone.\n\nChange-Id: Ief358b53df467ae24a65e30e7a631da59bf13683\n"
    },
    {
      "commit": "2605dec597f7ebabf31b7e9430f19ab888b2919a",
      "tree": "cdfd509e6019b77417d7ea641dc5672e4682e33a",
      "parents": [
        "b07b3d15b9b36c286440412e489659131e738e74"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Wed Mar 19 15:30:25 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Wed Mar 19 15:30:25 2014 -0700"
      },
      "message": "recovery: 64 bit build issues\n\nChange-Id: Ie88c49dea13cce5f4eb428e97f5a0956f2656a30\n"
    },
    {
      "commit": "e7b288824589b2828d83e1d47f6f12b0bd0fb353",
      "tree": "67a7d0814abc987c9763ce2d162d742c57c2810d",
      "parents": [
        "707d321a8745accf4660bf77e33f6acb9ce6b779"
      ],
      "author": {
        "name": "Maxim Siniavine",
        "email": "siniavine@google.com",
        "time": "Thu Feb 13 15:48:53 2014 -0800"
      },
      "committer": {
        "name": "Maxim Siniavine",
        "email": "siniavine@google.com",
        "time": "Thu Feb 13 15:53:38 2014 -0800"
      },
      "message": "Fix a crash when going into recovery mode.\n\nWhen going into recovery mode withoug recovery command file present, uncrypt crashes\nand the device gets stuck and eventually shuts down.\n\nCheck that the command file is present before trying to read from it.\n\nChange-Id: If0192d597032be0067738e437188d92993ce56f7\n"
    },
    {
      "commit": "76adfc5309936a07218ce53b5ab284d5746fa84c",
      "tree": "240cf66d904ec5e0cd8abea3523fa0e066de3d2e",
      "parents": [
        "99916f0496cfe37891d40f21a9a0e387620a8a60"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Jan 13 10:04:25 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Jan 16 13:37:55 2014 -0800"
      },
      "message": "program to store unencrypted files in an encrypted filesystem\n\nuncrypt can read a file on an encrypted filesystem and rewrite it to\nthe same blocks on the underlying (unencrypted) block device.  This\ndestroys the contents of the file as far as the encrypted filesystem\nis concerned, but allows the data to be read without the encryption\nkey if you know which blocks of the raw device to access.  uncrypt\nproduces a \"block map\" file which lists the blocks that contain the file.\n\nFor unencrypted filesystem, uncrypt will produce the block map without\ntouching the data.\n\nBug: 12188746\nChange-Id: Ib7259b9e14dac8af406796b429d58378a00c7c63\n"
    }
  ]
}
