)]}'
{
  "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": "5b5f6c2fd32839227d10ee3c97e662a415b80e2b",
      "tree": "c7d647e228e9cafda09087a62ea11d72dbd37e65",
      "parents": [
        "c704e06ce596bd0a6de66b10b108aee95535468a"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Jun 03 10:50:13 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Fri Jun 06 09:01:57 2014 -0700"
      },
      "message": "restore holo UI in recovery\n\nReturn to the recovery to the holo appearance.\n\nBug: 15424396\nChange-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243\n"
    },
    {
      "commit": "8c7457a2c56d0fad2f59d017bcbdbcac72e419b3",
      "tree": "771d57f47a95338ea6717d792bf15cdb8a6e577d",
      "parents": [
        "f5d9f891524862ba560650bd545668dc22622cdb",
        "48abd574cb1b7b0adbe1de36224fb974182aaa2d"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue May 13 17:38:15 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue May 13 17:38:15 2014 +0000"
      },
      "message": "am 48abd574: am 34ff5fe3: am 74b90b30: Merge \"screen_ui: Initialize text buffer\"\n\n* commit \u002748abd574cb1b7b0adbe1de36224fb974182aaa2d\u0027:\n  screen_ui: Initialize text buffer\n"
    },
    {
      "commit": "34ff5fe3f59abfb1984189ade32059cc47bf97e5",
      "tree": "5d7217ac31912f1a510fddc17048fd542e3897f2",
      "parents": [
        "1cd5242349bb1ef10eca76ff2c3e17415aecdf9d",
        "74b90b309f67dc3b8bb74e47c4eddf7ce511bc35"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue May 13 17:28:54 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue May 13 17:28:54 2014 +0000"
      },
      "message": "am 74b90b30: Merge \"screen_ui: Initialize text buffer\"\n\n* commit \u002774b90b309f67dc3b8bb74e47c4eddf7ce511bc35\u0027:\n  screen_ui: Initialize text buffer\n"
    },
    {
      "commit": "74b90b309f67dc3b8bb74e47c4eddf7ce511bc35",
      "tree": "e72e442e6a5ac7fdb04c4669418c113adcab265c",
      "parents": [
        "1c2cf1db0db2c9e9310d27bdc19c605f5537b72f",
        "80a7a4642be31db7ecd5eaa9e62b78deaa461146"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue May 13 17:25:51 2014 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue May 13 17:25:52 2014 +0000"
      },
      "message": "Merge \"screen_ui: Initialize text buffer\""
    },
    {
      "commit": "9551cf912180665a85f515c16d6412bb8ea2bf98",
      "tree": "2a09c6db6a26445ef7992d96ee396965ee403308",
      "parents": [
        "8d9d3d5cbe240d09db10d08956d152dce934e892"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Apr 04 13:48:33 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Apr 04 13:48:33 2014 -0700"
      },
      "message": "make density-specific recovery assets\n\nProvide different recovery UI resources for different display\ndensities.  Right now only the text images and the progress bars are\nrescaled; the main icon will get scaled when it\u0027s updated for QP.\n\nLightly quantum-ify the rest of the recovery interface.  (Light\nbackground, progress bars, etc.)\n\nChange-Id: Ia639c4ce8534b01bc843524efbc4b040c1cf38b3\n"
    },
    {
      "commit": "a68c517c628acdcfd0107536f34c3fd882ce0629",
      "tree": "bf08d4b39df094d50b0b671297b2fb807f5f40f8",
      "parents": [
        "76b245c24c12feec2381c423de2f7ffe4b78d7f0",
        "80c1a386d3f614919708b37986919ecaf74ee738"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Mar 17 23:33:14 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Mar 17 23:33:14 2014 +0000"
      },
      "message": "am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp\n\n* commit \u002780c1a386d3f614919708b37986919ecaf74ee738\u0027:\n  refactor image resource loading code in minui\n"
    },
    {
      "commit": "c4025e90f4e73bd9bf9665000276663e35c0066b",
      "tree": "f103aef739b9715fd1546b060e132a39a071a4af",
      "parents": [
        "52d0b765ab58e7def9783623092f1891a4d7f427",
        "d90da13076303a5377de631623e16c34ee195830"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Mar 17 16:13:08 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Mar 17 16:13:08 2014 -0700"
      },
      "message": "resolved conflicts for merge of d90da130 to klp-dev-plus-aosp\n\nChange-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0\n"
    },
    {
      "commit": "80c1a386d3f614919708b37986919ecaf74ee738",
      "tree": "2dda152c800117f1f6c7e789c7fb88bd5640f89b",
      "parents": [
        "4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49",
        "d90da13076303a5377de631623e16c34ee195830"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Mar 17 16:11:02 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Mar 17 16:11:02 2014 -0700"
      },
      "message": "resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp\n\nChange-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30\n"
    },
    {
      "commit": "a418aa7dd5e94cbf1ab2a6fa1c63f60e5e087d42",
      "tree": "629541c511f84bd4c42ef3de7ad099001874f05c",
      "parents": [
        "026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Mar 17 12:10:02 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Mar 17 12:27:08 2014 -0700"
      },
      "message": "refactor image resource loading code in minui\n\nReduce the number of copies of libpng boilerplate.  Rename\nres_create_* functions to be more clear.  Make explicit the use of the\nframebuffer pixel format for images, and handle more combinations of\ninput and output (eg, loading a grayscale image for display rather\nthan use as a text alpha channel).\n\nChange-Id: I3d41c800a8f4c22b2f0167967ce6ee4d6b2b8846\n"
    },
    {
      "commit": "4048200cd6baf8df35f7100afbdbd3067502eae8",
      "tree": "35998afaedc55bed4c3f44b95fb407825c25c006",
      "parents": [
        "546f357d038466b0fd055a5d9a6baee20e8cdcfe",
        "c91612d4668688c5d7bf76c258c11010697a03d2"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Mar 13 15:46:53 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Mar 13 15:46:53 2014 +0000"
      },
      "message": "am c91612d4: Merge \"remove pixelflinger from recovery\"\n\n* commit \u0027c91612d4668688c5d7bf76c258c11010697a03d2\u0027:\n  remove pixelflinger from recovery\n"
    },
    {
      "commit": "cfcec9e1d468708269edbd1e8520d1253989aefb",
      "tree": "10485d489baff7a80488b5daf7381916c1fd8b0e",
      "parents": [
        "be7eea0a880ed266bb4111dcc3a2159fdb8791d5",
        "ea868b3846794cd36424f477503377ea9348137a"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Mar 13 08:44:07 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Mar 13 08:44:07 2014 -0700"
      },
      "message": "Merge commit \u0027ea868b38\u0027 into manualmerge\n\nConflicts:\n\tscreen_ui.cpp\n\tscreen_ui.h\n\nChange-Id: Iefe7dde04cc76639f56730a19238436073f18ffb\n"
    },
    {
      "commit": "cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f",
      "tree": "fcabf54bb6676e3e34a33d16ab79a15c11c2f661",
      "parents": [
        "7003ff3b54e9081dba92ecfea0594355af40e6dd",
        "c91612d4668688c5d7bf76c258c11010697a03d2"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Mar 12 02:42:57 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Mar 12 02:42:57 2014 +0000"
      },
      "message": "am c91612d4: Merge \"remove pixelflinger from recovery\"\n\n* commit \u0027c91612d4668688c5d7bf76c258c11010697a03d2\u0027:\n  remove pixelflinger from recovery\n"
    },
    {
      "commit": "c15b7865badc3ac406a7ce978baa65151a50bb55",
      "tree": "4298bb59e37a9f1ea05e89391564c3bb13f75732",
      "parents": [
        "49968f0903eb69b1505bc99926344aacee4e81b6",
        "ea868b3846794cd36424f477503377ea9348137a"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Mar 11 19:39:26 2014 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Mar 11 19:39:26 2014 -0700"
      },
      "message": "resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp\n\nChange-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1\n"
    },
    {
      "commit": "16f97c3961f08e5db7930d99e592f0a9f752df46",
      "tree": "5d3e2eb928250e33d7b6580e0ac80fd2404898ab",
      "parents": [
        "8f087d024619467de8609656e8a14370f24b817c"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Mar 06 16:16:05 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Mar 11 14:40:04 2014 -0700"
      },
      "message": "remove pixelflinger from recovery\n\nRecovery now draws directly to the framebuffer by rolling its own\ngraphics code, rather than depending on libpixelflinger.\n\nThe recovery UI is modified slightly to eliminate operations that are\nslow with the software implementation: when the text display / menu is\nturned on, it now appears on a black background instead of a dimmed\nversion of the recovery icon.\n\nThere\u0027s probably substantial room for optimization of the graphics\noperations.\n\nBug: 12131110\nChange-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595\n\nConflicts:\n\tminui/resources.c\n"
    },
    {
      "commit": "469954fe3d7c3d729e500512ab911a037b90cc77",
      "tree": "979387b5cb6cb777638f71c8773fbebbca04fea0",
      "parents": [
        "2f173bde6584f4c560ecc3f13f6e890f52815050"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Mar 07 09:21:25 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Mar 11 14:06:35 2014 -0700"
      },
      "message": "change how recovery animation is implemented\n\nInstead of one \u0027base\u0027 installing image and a number of overlay images\nthat are drawn on top of it, we represent the installing animation\nwith one PNG that contains all the animation frames, interlaced by\nrow.  The PNG is expected to have a text chunk with the keyword\n\u0027Frames\u0027 and a value that\u0027s the number of frames (as an ascii\nstring).  This representation provides better compression, removes the\nneed to subclass ScreenRecoveryUI just to change the position of the\noverlay or number of frames, and doesn\u0027t require gr_blit() to support\nan alpha channel.\n\nWe also remove the \u0027indeterminate\u0027 progress bar used when wiping data\nand/or cache.  The main animation serves the same purpose (showing\nthat the device is still alive); the spinning progress bar has been\nredundant for a while.\n\nThis changes the default recovery animation to include the\nantenna-wiggling and gear-turning that\u0027s used in the Nexus 5 recovery\nanimation.\n\nChange-Id: I51930a76035ac09969a25472f4e572b289418729\n\nConflicts:\n\tscreen_ui.cpp\n\tscreen_ui.h\n"
    },
    {
      "commit": "39cf417e17011a72dd39acfe4cc8c90af26bdbaf",
      "tree": "ba41f425926bfe68baf488f8ae5b0044c2a19f73",
      "parents": [
        "eac881c952fc6be0beeb5f719e3a70e651f3610e"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Mar 06 16:16:05 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Tue Mar 11 11:10:00 2014 -0700"
      },
      "message": "remove pixelflinger from recovery\n\nRecovery now draws directly to the framebuffer by rolling its own\ngraphics code, rather than depending on libpixelflinger.\n\nThe recovery UI is modified slightly to eliminate operations that are\nslow with the software implementation: when the text display / menu is\nturned on, it now appears on a black background instead of a dimmed\nversion of the recovery icon.\n\nThere\u0027s probably substantial room for optimization of the graphics\noperations.\n\nBug: 12131110\nChange-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595\n"
    },
    {
      "commit": "eac881c952fc6be0beeb5f719e3a70e651f3610e",
      "tree": "89508421fe11ed892975a0d967c12a9e97619384",
      "parents": [
        "182c1df40a3af36eca4ff0106a26a93f5744a56e"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Mar 07 09:21:25 2014 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Fri Mar 07 09:45:44 2014 -0800"
      },
      "message": "change how recovery animation is implemented\n\nInstead of one \u0027base\u0027 installing image and a number of overlay images\nthat are drawn on top of it, we represent the installing animation\nwith one PNG that contains all the animation frames, interlaced by\nrow.  The PNG is expected to have a text chunk with the keyword\n\u0027Frames\u0027 and a value that\u0027s the number of frames (as an ascii\nstring).  This representation provides better compression, removes the\nneed to subclass ScreenRecoveryUI just to change the position of the\noverlay or number of frames, and doesn\u0027t require gr_blit() to support\nan alpha channel.\n\nWe also remove the \u0027indeterminate\u0027 progress bar used when wiping data\nand/or cache.  The main animation serves the same purpose (showing\nthat the device is still alive); the spinning progress bar has been\nredundant for a while.\n\nThis changes the default recovery animation to include the\nantenna-wiggling and gear-turning that\u0027s used in the Nexus 5 recovery\nanimation.\n\nChange-Id: I51930a76035ac09969a25472f4e572b289418729\n"
    },
    {
      "commit": "a766c34f86ddecbdc61634eb582a2ebce8253dc5",
      "tree": "62944cf1db7b74fbd93a065e402367cc87ea9ac1",
      "parents": [
        "9fb676aa924b2ad1c1f2f8f44734b1ecd9f909dc",
        "d327c63af691a36fbf53866a3ae7ad27a43ebe3b"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Dec 02 23:30:51 2013 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 02 23:30:51 2013 +0000"
      },
      "message": "am d327c63a: am c87bab10: add the functions for multi-stage packages to updater\n\n* commit \u0027d327c63af691a36fbf53866a3ae7ad27a43ebe3b\u0027:\n  add the functions for multi-stage packages to updater\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": "9b8ae8038be65c2ec236bc04590716fbcd5363f6",
      "tree": "6340b6b0d4a5c088280eb8778ae13a355e8fa0da",
      "parents": [
        "9690e2b370f3f303ef75e1fd5c7fdbea8787d46a"
      ],
      "author": {
        "name": "Alistair Strachan",
        "email": "alistair.strachan@imgtec.com",
        "time": "Wed Jul 17 10:34:36 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Nov 18 09:51:32 2013 -0800"
      },
      "message": "Fix rare crash seen when dereferencing backgroundIcon[NONE].\n\nBecause backgroundIcon[] is not initialized by the ScreenRecoveryUI\nconstructor, it should be initialized explicitly to NULL in Init().\n\nIf it is not initialized, ScreenRecoveryUI::SetBackground() can fail\nfor the NONE icon because the NULL test can fail and junk will be\ndereferenced.\n\nChange-Id: I4e3738d2e241ed90df43c984fb41e0072933f50a\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": "80a7a4642be31db7ecd5eaa9e62b78deaa461146",
      "tree": "6963f23be4300dd6af9564a4acfadfb8b2db216b",
      "parents": [
        "58c60900ac3682fab08f64373bdd1020713b48f7"
      ],
      "author": {
        "name": "Bjorn Andersson",
        "email": "bjorn.andersson@sonymobile.com",
        "time": "Fri Aug 30 16:59:06 2013 -0700"
      },
      "committer": {
        "name": "Bjorn Andersson",
        "email": "bjorn.andersson@sonymobile.com",
        "time": "Mon Sep 30 13:57:49 2013 -0700"
      },
      "message": "screen_ui: Initialize text buffer\n\nZero initialize the text buffer to make recovery not\nrender garbage when showing the menu or messages.\n\nChange-Id: I0dd0d357757f6b0fd52ad3b3617d42bb1b835245\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": "239ac6abac4524be93fce710360c0512c6cc2ab3",
      "tree": "55428f9ad654b63d4002ca94902440648c955b96",
      "parents": [
        "c0441d171914e59941ec4f815ae0aabf56d6504f"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Aug 20 16:03:25 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Wed Aug 21 13:44:35 2013 -0700"
      },
      "message": "recovery: install packages in a known mount environment\n\nWhen installing a package, we should have /tmp and /cache mounted and\nnothing else.  Ensure this is true by explicitly mounting them and\nunmounting everything else as the first step of every install.\n\nAlso fix an error in the progress bar that crops up when you do\nmultiple package installs in one instance of recovery.\n\nChange-Id: I4837ed707cb419ddd3d9f6188b6355ba1bcfe2b2\n"
    },
    {
      "commit": "c0441d171914e59941ec4f815ae0aabf56d6504f",
      "tree": "2382931433409feae532e7a7fb4ac05016336196",
      "parents": [
        "3c3ee3bc33d35cf3939f57f6c649459280b57827"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 31 11:28:24 2013 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Jul 31 11:35:12 2013 -0700"
      },
      "message": "notify about pending long press\n\nRecovery changes:\n\n- add a method to the UI class that is called when a key is held down\n  long enough to be a \"long press\" (but before it is released).\n  Device-specific subclasses can override this to indicate a long\n  press.\n\n- do color selection for ScreenRecoveryUI\u0027s menu-and-log drawing\n  function.  Subclasses can override this to customize the colors they\n  use for various elements.\n\n- Include the value of ro.build.display.id in the menu headers, so you\n  can see on the screen what version of recovery you are running.\n\nChange-Id: I426a6daf892b9011638e2035aebfa2831d4f596d\n"
    },
    {
      "commit": "5b468fc9305bf3adef681fa1e56364fc51761af8",
      "tree": "cbce8a65f7e9ab286fe30938e6d65928d989e5dd",
      "parents": [
        "f24fd7e8479d54eaa2b73db5a3a3ad076a13f72d"
      ],
      "author": {
        "name": "yetta_wu",
        "email": "yetta_wu@asus.com",
        "time": "Tue Jun 25 15:03:11 2013 +0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jul 02 12:35:58 2013 -0700"
      },
      "message": "recovery: init backgroundIcon properly to avoid recovery mode crash\n\nWe met factory issue that some devices would crash in recovery mode\nbecause the backgroundIcon array did not reset to NULL when initializing.\n\nBug: 9568624\nChange-Id: I13c7a7cc1053a7ffdbadd71740c1a2b4a2af6bba\nSigned-off-by: yetta_wu \u003cyetta_wu@asus.com\u003e\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n"
    },
    {
      "commit": "2f6877a0220475303907203308c018d789ea1a53",
      "tree": "9268277112eb6914c3f3a3db40b6af55e2a8144d",
      "parents": [
        "da1ebaef0aa8e38db6edf8bfc3d96290461a424f"
      ],
      "author": {
        "name": "yetta_wu",
        "email": "yetta_wu@asus.com",
        "time": "Tue Jun 25 15:03:11 2013 +0800"
      },
      "committer": {
        "name": "Iliyan Malchev",
        "email": "malchev@google.com",
        "time": "Tue Jun 25 12:50:20 2013 -0700"
      },
      "message": "recovery: init backgroundIcon properly to avoid recovery mode crash\n\nWe met factory issue that some devices would crash in recovery mode\nbecause the backgroundIcon array did not reset to NULL when initializing.\n\nBug: 9568624\nChange-Id: I13c7a7cc1053a7ffdbadd71740c1a2b4a2af6bba\nSigned-off-by: yetta_wu \u003cyetta_wu@asus.com\u003e\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n"
    },
    {
      "commit": "6fd59ac07d91eb373f4269a40e688aa82a6ccc6e",
      "tree": "64807edcb65fd2abd80c19c79cad6986f99ca396",
      "parents": [
        "55a36ac1e01205f2cd461cd2f89d92e3b64cddd2"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Wed Mar 06 15:01:11 2013 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Mar 07 13:34:24 2013 -0800"
      },
      "message": "more font improvements and cleanup\n\nGet rid of the notion of a font\u0027s \"ascent\"; the reference point for\ndrawing is the top-left corner of the character box rather than the\nbaseline.  Add some more space between the menu entries and make the\nhighlight bar around the text.\n\nReplace the default font.png with two images; the build system will\ninclude one or the other based on the resolutions of the device.\n\nRestore the original compiled-in bitmap font, to fall back on when\nfont.png can\u0027t be found (eg, in the charger binary).\n\nAdd support for bold text (when a font.png image is used).\n\nChange-Id: I6d211a486a3636f20208502b1cd2aeae8b9f5b02\n"
    },
    {
      "commit": "55a36ac1e01205f2cd461cd2f89d92e3b64cddd2",
      "tree": "f51ded2ae67f844bfb39457b58ae2dff9f83805b",
      "parents": [
        "869abf03e2b4d3d5e9b942fe165254969f0e5d9b"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Mar 04 15:49:02 2013 -0800"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Mon Mar 04 16:37:44 2013 -0800"
      },
      "message": "recovery: change font for menus to be an image\n\nInstead of representing the font used for menus and log messages in\nthe recovery binary, load it from a resource PNG image.  This allows\ndifferent devices to substitute their own font images.\n\nChange-Id: Ib36b86db3d01298aa7ae2b62a26ca29e6ef18014\n"
    },
    {
      "commit": "8347cb2d813b9a8b7c9165aadaea0b699eb5082f",
      "tree": "e53e6deaab753b1e7430d072e2fde63d44a43936",
      "parents": [
        "6c8553dda8b7fb45adc9f48a294c130b7e283f40"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Oct 08 08:38:16 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Mon Oct 08 08:38:16 2012 -0700"
      },
      "message": "revert to tacky 3D recovery animation\n\nBug: 7204420\nChange-Id: I16d3346ce54b1aa5a0e6a02839ae9fbd4718fffa\n"
    },
    {
      "commit": "b66cb69e3933d5f56f06d88cd31817f49d87df5f",
      "tree": "0afa7d4bca2d1042f1cf3085c121967de2a92815",
      "parents": [
        "5fa8c23911759a9e81af0e7fb5eb431277b8e9a6"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Sep 18 14:52:18 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Sep 18 14:52:18 2012 -0700"
      },
      "message": "tweak recovery text images\n\nCenter and fix the extents for those locales that have multiple lines\nof text.  Add Urdu as an RTL language.\n\nBug: 7064142\nChange-Id: I4c1aa1198be29cab01129dabf2c4a026b93719a6\n"
    },
    {
      "commit": "5fa8c23911759a9e81af0e7fb5eb431277b8e9a6",
      "tree": "6990ad74371795a16ac1670bb21ca2f8e6aeb6bd",
      "parents": [
        "52eeea4fa59c15ecb09c32b8e05653f4e55f5188"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Sep 18 12:37:02 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Sep 18 12:37:02 2012 -0700"
      },
      "message": "localization for recovery messages\n\nAdd images of text for all locales we support.  Make the progress bar\nfill the correct way for RTL languages.  (Flip the direction the\nspinner turns, too, just for good measure.)\n\nBug: 7064142\nChange-Id: I5dddb26e02ee5275c57c4dc4a03c6d68432ac7ba\n"
    },
    {
      "commit": "32c8eb81af916f04fd42e7294f699b10474beef6",
      "tree": "d845c9e6435c0b6f6b1e6bc490315600b20e72eb",
      "parents": [
        "19968d07328bd8eaebddf89bcc3434fe14a6628c"
      ],
      "author": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Tue Sep 11 15:28:06 2012 -0400"
      },
      "committer": {
        "name": "Dees_Troy",
        "email": "dees_troy@teamw.in",
        "time": "Wed Sep 12 15:14:38 2012 -0400"
      },
      "message": "Make text appear in GUI console, Zip install works.\n\nMove TW zip install code to C++ so that it can use the\nui-\u003efunctions.\nBring in mincrypt code to fix a crash during signature\nchecking.\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": "52eeea4fa59c15ecb09c32b8e05653f4e55f5188",
      "tree": "d26dc6dc861c69c8f80ae9aac9a13b14bee3381b",
      "parents": [
        "f4c6ec84c24611856374353bdef87baca5694cc0"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Sep 04 14:28:25 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Tue Sep 04 14:28:25 2012 -0700"
      },
      "message": "minor recovery fixes\n\n- protect against missing/malformed bitmaps: fail to display them but\n  don\u0027t crash.\n\n- don\u0027t draw animation overlays until the overlay offset is computed.\n\n- logging cleanup\n\nChange-Id: Ieb1c155cfbb11e643000bdb5d1a57900c8757739\n"
    },
    {
      "commit": "4f33e55d1c38d2f72f3306a82c177850f3676408",
      "tree": "26f0cfb8893bf21faaf3ec6ad1670159a01d454b",
      "parents": [
        "02ec6b88ed4e6cf40cc257572b07c7277b7b6341"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Aug 23 13:16:12 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Thu Aug 23 13:19:02 2012 -0700"
      },
      "message": "change recovery images to android with spinner\n\nAlso make writing the locale a bit more robust.\n\nChange-Id: I803dd0aa0b9d6661fad74ea13fb085682402323c\n"
    },
    {
      "commit": "02ec6b88ed4e6cf40cc257572b07c7277b7b6341",
      "tree": "2aa6f95cb875d258f62a5342ec2bb1ad0093e3bd",
      "parents": [
        "a3ccba6d314cb29b02d1dbda9a71427b11da936d"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Wed Aug 22 17:26:40 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@google.com",
        "time": "Wed Aug 22 17:26:40 2012 -0700"
      },
      "message": "add simple text to recovery UI\n\n- recovery takes a --locale argument, which will be passed by the main\n  system\n\n- the locale is saved in cache, in case the --locale argument is\n  missing (eg, when recovery is started from fastboot)\n\n- we include images that have prerendered text for many locales\n\n- we split the background states into four (installing update,\n  erasing, no command, error) so that appropriate text can be shown.\n\nChange-Id: I731b8108e83d5ccc09a4aacfc1dbf7e86b397aaf\n"
    },
    {
      "commit": "69f4b6732ce13f248b0da0c7eeda56207fdeaba2",
      "tree": "0814e90f6d8f47ddad58fe75684384c864ba652c",
      "parents": [
        "f69d40afa190a2b6938979fe10760c74a8cc55b3"
      ],
      "author": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Apr 26 14:37:53 2012 -0700"
      },
      "committer": {
        "name": "Doug Zongker",
        "email": "dougz@android.com",
        "time": "Thu Apr 26 14:37:53 2012 -0700"
      },
      "message": "fix timed progress bars in recovery\n\nThey\u0027re completely broken and have been for months because this code\nmakes no sense.\n\nChange-Id: Ibabcd3dbe5a004a45b341e4a5215aa3df77e1861\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": "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"
    }
  ]
}
