)]}'
{
  "log": [
    {
      "commit": "89e1fec9af78b94cbafc21fe22a69213ae31a6fa",
      "tree": "cb6cdaf40b2cf742ab738f99ac43e532600e7c7a",
      "parents": [
        "81f429e097055079cd2a9c7875c1a5dbea0dea06",
        "f4db8f997307179ea42b33b8d3c6621b2d8ec0bc"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Sep 24 01:30:59 2013 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Sep 24 01:30:59 2013 +0000"
      },
      "message": "Merge \"Fit and finish for navbar camera affordance\" into klp-dev"
    },
    {
      "commit": "257f283b0e4cc1c1fa4e7f2472d3ee4ab3b451d0",
      "tree": "4e41e39ec21590d90017af58f9d16fdff06628dc",
      "parents": [
        "f9b70ab87e8f26b57ac3d8dc3b77052e747cb888"
      ],
      "author": {
        "name": "John Spurlock",
        "email": "jspurlock@google.com",
        "time": "Sat Sep 21 18:41:53 2013 -0400"
      },
      "committer": {
        "name": "John Spurlock",
        "email": "jspurlock@google.com",
        "time": "Mon Sep 23 15:59:15 2013 -0400"
      },
      "message": "Introduce transparent bars to the keyguard.\n\nDriven by a new framework config bool. Tested on all layouts,\nbut disabled by default.  Can be enabled with a config overlay.\n\n(Sliding/MultiPane)ChallengeLayout have custom measure/layout\nlogic that peeks at the root view\u0027s padding (!).  So we must keep\nthe root view\u0027s padding \u003d system window insets. However, we need\nthe scrims + the fullscreen camera widget preview to use the entire\ndisplay size if the bars are transparent.\n\nSo the approach is to maintain the root view\u0027s\n(KeyguardViewManager$ViewManagerHost) padding as before via\nsetFitsSystemWindows(true) but allow non KeyguardHostViews to\nextend into the padding if bars are transparent via a custom\nmeasure/draw on the root view.\n\nKeyguardHostView background + challege scrims moved up to the\nroot view.\n\nAlso:\n- Remove logspam line for fixed bug.\n\n- Fix status bar staying opaque on interaction on secure keyguard.\n\nKnown issues:\n- Nav bar blip dismissing global actions, keyguard app widget picker\nbars are opaque.  Both will use the new inherit flag once it exists.\n\n- Emergency dialer layout dance, will be fixed in the phone project.\n\nBug:10606085\nChange-Id: I2648b4ee9a54a67324ce9dcbab976ad4da4bbcfa\n"
    },
    {
      "commit": "f4db8f997307179ea42b33b8d3c6621b2d8ec0bc",
      "tree": "71ce1f46284b7f1d3d7ea3004f0e6a88377bb2e5",
      "parents": [
        "3855b99ff088abe5c25b35e0dc000644eb2d5fcb"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Sep 20 14:21:50 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Sep 20 20:50:00 2013 -0700"
      },
      "message": "Fit and finish for navbar camera affordance\n\n- disable search gadget while interacting with camera\n- clean up code that deals with warping to track both warp and swap views.\n- fade camera and search icon when camera touched\n- slide camera view on screen when camera is touched.\n- fix fling of camera page to center in view when animation finishes.\n- resolve stateful bug between edge swipe and camera button.\n\nBug 10332383\n\nChange-Id: I8fc38148a01927bc7c228101308c3c4214113047\n"
    },
    {
      "commit": "caf24fc2c4bb9747eb80138bf3ce0be067851749",
      "tree": "a81859dd75a9ca17e752c32f1ecf0b40a62df1bd",
      "parents": [
        "f429247867ac524cf63bc01499ac47a90ebcaca9"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Sep 10 18:37:01 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Sep 19 17:14:59 2013 -0700"
      },
      "message": "Add camera affordance to navigation bar on phones\n\nThis adds a camera button on phones that can be used to show\nand launch the camera.\n\n- Minor refactoring of touch event dispatch in PagedView.\n- Disables usability hints when keyguard loads.\n- Only add a touch handler for camera icon once during layout.\n- Update after review.\n- Updated with latest UX camera and camera background assets\n\nChange-Id: I09cd5cb0e501fd0f4659bea96d00c92b07f805c4\n"
    },
    {
      "commit": "7fce38021694925295f5d14bfba71f28cba19404",
      "tree": "98a8e61f646381dd8b6a7ae15902031ce898bc62",
      "parents": [
        "463850e0c658b37bbe29b9e9dec6ff7565bb883f"
      ],
      "author": {
        "name": "Brian Colonna",
        "email": "bcolonna@google.com",
        "time": "Tue Sep 17 15:51:32 2013 -0400"
      },
      "committer": {
        "name": "Brian Colonna",
        "email": "bcolonna@google.com",
        "time": "Tue Sep 17 17:33:21 2013 -0400"
      },
      "message": "Fix 10550373: Stopping FUL when emergency dialer opens\n\nFace Unlock wasn\u0027t being stopped when the emergency dialer opened,\ncausing FUL to flash briefly after the emergency dialer appeared.\nThis was most noticeable on Hammerhead devices.\n\nThis change allows EmergencyButton to stop FUL by way of\nKeyguardUpdateMonitor.  Note that it must stop FUL immediately rather\nthan going through a handler.  If going through a handler FUL is not\nstopped in time to prevent the issue.\n\nChange-Id: I3985969a19e909e2633d7876a3fb2d34c70e2cc1\n"
    },
    {
      "commit": "65a6ba347848069b198869a7500d07a419aaf15d",
      "tree": "d90fdc6a2e3041b32cc9c80f2c49f9c032e46b6e",
      "parents": [
        "d9f4e0cf2c2466d9e05f8562e55d342934f7ed0d"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Wed Sep 11 09:48:00 2013 -0700"
      },
      "committer": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Wed Sep 11 11:01:13 2013 -0700"
      },
      "message": "Remove HotwordRecognition APIs\n\n- and its usage from Keyguard\n\nBug: 10708010\nChange-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c\n"
    },
    {
      "commit": "1f0ef2cc33e5b8fe00a869c22eabfd08cf7de504",
      "tree": "05d0e2d180432fcf2f5accee238f7be5f29d9790",
      "parents": [
        "1cf2b91fe533d9e50bce6e5551ae26bccdb4a965"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Fri Sep 06 17:21:45 2013 -0700"
      },
      "committer": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Fri Sep 06 18:12:11 2013 -0700"
      },
      "message": "Move public consts to HotwordRecognitionService\n\n- The HotwordRecognitionService is the only public component of\n  Hotword recognition allowing others to implement hotword recognition\n- The client API is not available for use by all, hence the consts need\n  to be moved to the service class.\n- Ideally we\u0027d have retained the public consts in the client side API\n  (HotwordRecognizer)\n\nChange-Id: Ibd0d1c0d0514ec4e8f7c284e22c5fa6b7ef3df26\n"
    },
    {
      "commit": "4473f020037ed2a01e8288497b9f27cff1b6b8d4",
      "tree": "3f6c8edc486201bebbb1c1af8e2cacd1efe5fd56",
      "parents": [
        "498a5f5488446e1d5914f5d335ee02572c6201d1"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Fri Sep 06 12:32:52 2013 -0700"
      },
      "committer": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Fri Sep 06 12:48:51 2013 -0700"
      },
      "message": "Use the permission for hotword recognition\n\n- Also fixes an issue with PendingIntents being launched from the\n  lockscreen taking a lot of time\n\nChange-Id: I91b44328ba68b225454322b90a5b19a0d4c9a772\n"
    },
    {
      "commit": "228b35109a6b8d75f1963178f3eff262a06db411",
      "tree": "6bd6fcd785eae79fc6933847182faa53b8b95ff6",
      "parents": [
        "7f71206d009e737e91c4c767183befe6006497c6",
        "eec83dcadd1dca722d3070fe5eae7d4e0561aa2b"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Thu Sep 05 01:08:23 2013 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 05 01:08:23 2013 +0000"
      },
      "message": "Merge \"Move the hotword code to KeyguardHostView\" into klp-dev"
    },
    {
      "commit": "eec83dcadd1dca722d3070fe5eae7d4e0561aa2b",
      "tree": "976874253987bb8f564513e0e45b41df9b82c656",
      "parents": [
        "de59baab31271a186a2f32719abd19a8adbda1e3"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Wed Sep 04 14:59:59 2013 -0700"
      },
      "committer": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Wed Sep 04 17:47:34 2013 -0700"
      },
      "message": "Move the hotword code to KeyguardHostView\n\n- Try hotword detection on Pattern unlock screen as well - disabled in\n  this CL\n- Explicitly stop hotword detection when starting the assist intent.\n\nChange-Id: I3d22a9029abf888431113b86e4410ea9e9866c57\n"
    },
    {
      "commit": "1f0c596563584a3929651d7ac3493f974b3d2eac",
      "tree": "e536d8d864b2a49b07411fdf68cfd9c50ff19abe",
      "parents": [
        "96661c42d0643c129fed60678aa0b8f99d32b456"
      ],
      "author": {
        "name": "John Spurlock",
        "email": "jspurlock@google.com",
        "time": "Tue Sep 03 12:04:38 2013 -0400"
      },
      "committer": {
        "name": "John Spurlock",
        "email": "jspurlock@google.com",
        "time": "Tue Sep 03 12:04:38 2013 -0400"
      },
      "message": "Remove unused status bar icon stat_sys_secure.\n\nIt was moved behind an undocumented setting three yrs ago.\n\nBug:10502089\nChange-Id: Icef0e3deaa9b09afab98bbb76520b47a16da2069\n"
    },
    {
      "commit": "dd238b5604e14d0da458f9b7589097d365a9dfd1",
      "tree": "03d939ef05d104c7af04c736e04a141c5fe26600",
      "parents": [
        "90b9180580128b337b76a5de72d8f76646ec5aec",
        "2ec4ff435b0af87a6c0f933e6eaf1155e34c430f"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Aug 30 19:55:38 2013 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Aug 30 19:55:42 2013 +0000"
      },
      "message": "Merge \"Attempt to fix missing clock bug\" into klp-dev"
    },
    {
      "commit": "d54281061c1d610fde54cbc4e7408b73a82e6378",
      "tree": "505dd1ffd9504d0f75c33e12e5ea6eceed695d35",
      "parents": [
        "720959cc7f9fffb45a57b928c66a045bfc256a7c"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Aug 29 18:58:21 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Aug 29 18:58:21 2013 -0700"
      },
      "message": "Disable hotword detection on low-memory devices\n\nChange-Id: If21f852af36a8f6dea17f3a87b22f39db3d1d6e8\n"
    },
    {
      "commit": "2ec4ff435b0af87a6c0f933e6eaf1155e34c430f",
      "tree": "130e685fe9f774fa6c43c03e7693c6a2dbe10142",
      "parents": [
        "f8388885e49a0a0fa71f9a90301bd90a349cb1dd"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Aug 28 17:41:16 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Aug 28 17:41:16 2013 -0700"
      },
      "message": "Attempt to fix missing clock bug\n\nThis attempts to fix a bug where the clock wasn\u0027t being added\nwhen widgets are disabled.\n\nFixes bug 10473246\n\nChange-Id: I63f4c04778da938b6fa1bc74de3fa0463412da0f\n"
    },
    {
      "commit": "42c3e02c52fb487676251b297461f6ff7beff3ef",
      "tree": "fadce7f86faea34618c4f2251a9a48b55c811c2e",
      "parents": [
        "bd31a483d358b02e4a16949b576560d4e0672ea3"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Mon Aug 26 20:58:53 2013 -0700"
      },
      "committer": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Wed Aug 28 23:40:32 2013 +0000"
      },
      "message": "Start using the Hotword recognition APIs\n\n- Gets rid of all assumptions about the hotword service\n- Fixes bug where the hotword detection would keep running accidentally\n  even when the screen got turned off\n\nChange-Id: Ie86c1a4f4343bdf7e61f7c21114fd3b287bd5401\n"
    },
    {
      "commit": "c4c330156efc3476634c83c6ab3ae22fe2ea88a4",
      "tree": "983bcbc2a04bb38528c4cca13d81df0110d9573f",
      "parents": [
        "aeda265c4dcdd60484f9d1923e3fdcba761112e0"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Tue Aug 27 13:25:40 2013 -0700"
      },
      "committer": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Tue Aug 27 13:25:40 2013 -0700"
      },
      "message": "Temporary disable Hotword on lockscreen\n\nChange-Id: Icdddcc0308b9f3153172e34a8f4d051c58829653\n"
    },
    {
      "commit": "f45bb403884f30ecb383698ef1bcb1c7dc1964b8",
      "tree": "c38b8ea700eab25a7e9639585213511a452af181",
      "parents": [
        "570cd0f4c06a6e3de2af348040415ff2fcff57a1"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Aug 20 18:58:32 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Aug 23 17:36:30 2013 -0700"
      },
      "message": "Add setting to disable keyguard widgets\n\nThis allows disabling keyguard widgets through Settings.\nOn new devices, the setting is turned off by default.  If the\nuser currently has widgets in keyguard, then we keep them\nand re-enable the setting.\n\nChange-Id: I7258921231d439925ac8627105710efa99309094\n"
    },
    {
      "commit": "f4d922b2d9c2011bcdc0543b5cdf2dd53ca04b25",
      "tree": "d92d445c58ae7afb6148c5d82b2e3a6d8b1ee39f",
      "parents": [
        "0a94b9ce277ef2ec79902e3c576a50ab438dca97"
      ],
      "author": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Thu Aug 15 16:08:42 2013 -0700"
      },
      "committer": {
        "name": "Sandeep Siddhartha",
        "email": "sansid@google.com",
        "time": "Tue Aug 20 14:17:02 2013 -0700"
      },
      "message": "Add hotword detection in insecure keyguard\n\n- This talks to a service that\u0027s implemented by the Search app\n- The AIDL interface may be moved to the framework in a later CL\n\nChange-Id: I26553e46f7d17ba4ac7a952c871b28b261cba975\n"
    },
    {
      "commit": "bfdad8ecad06f855c8facf72177b0f01919ff629",
      "tree": "43738fd9ad024d1984aec67ac46096c8579a772c",
      "parents": [
        "51a845688c58ab19928a37417a2400467607cadf"
      ],
      "author": {
        "name": "Jaekyun Seok",
        "email": "jaekyun@google.com",
        "time": "Mon Jul 08 13:53:21 2013 +0900"
      },
      "committer": {
        "name": "Jaekyun Seok",
        "email": "jaekyun@google.com",
        "time": "Fri Jul 12 17:23:29 2013 +0900"
      },
      "message": "Add a keycode to switch audio tracks (1/2)\n\nA key to switch audio tracks is general on media devices like blu-ray.\n\nBug: 9728155\nChange-Id: Ib61822b8aa9c143a8febc3cff4707fa775119448\n"
    },
    {
      "commit": "cf182aac94e181c211b677402517af845a0241bb",
      "tree": "d1fccbd51bbb5dc9c94c94fb07727e2ca7d72668",
      "parents": [
        "afb292a23cd56e6f328164ede81522afe7ef1f89"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Jun 28 16:55:56 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Jun 28 16:55:56 2013 -0700"
      },
      "message": "Minor cleanup of KeyguardViewManager\n\nRemoved unused code and redundant check for high-end graphics.\n\nChange-Id: I750d3918e5448760e622a4b3d1781b375bdc66db\n"
    },
    {
      "commit": "e51cf7aeb6157017801a802b4c1d74cbf51b7a01",
      "tree": "6ea2731697eb9e31bac00b1f35445cf62e48c472",
      "parents": [
        "5729b81ab56379e3b8736a2c716421e185756460"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Jun 25 18:31:56 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Jun 27 15:58:29 2013 -0700"
      },
      "message": "Simplify wake management code in keyguard.\n\nRemoves onWakeKey/Motion handling from keyguard since it\u0027s no longer used.\nThe legacy code was originally intended to have keyguard filter wake events\nwhich is now done in PhoneWindowManager. Ultimately it just needs to call\nPowerManager.wakeUp() since keyguard no longer filters these keys.\n\nChange-Id: I5b8ef9b422abf850a85b57f21944e5eb09fbedc2\n"
    },
    {
      "commit": "e77737f4cd4d2070405ea549bca297e6b66a5234",
      "tree": "5d2f4b7a64414c7a3ac3c07b5613b612d82392d6",
      "parents": [
        "20914c6ae93b5f4f86c014a0a38f6501e1c59e6c",
        "2542fd54ac943002cb7537029404dcc80a6491ac"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Sat Jun 01 09:51:40 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Jun 01 09:51:40 2013 -0700"
      },
      "message": "am 2542fd54: am 00d4c946: Merge \"Fix keyguard issue where an incoming SMS would switch widget\" into jb-mr2-dev\n\n* commit \u00272542fd54ac943002cb7537029404dcc80a6491ac\u0027:\n  Fix keyguard issue where an incoming SMS would switch widget\n"
    },
    {
      "commit": "a62996e3c5e7f01a3e031a772dfebb7011942b06",
      "tree": "3ea19de126e46481cfecdc2fe31461d0cbe3176c",
      "parents": [
        "d078990429997788927d708e4e1c959ead5dfcac",
        "2f567679f40ad0580928502972308ec540eeba3f"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu May 23 14:08:18 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu May 23 14:08:18 2013 -0700"
      },
      "message": "am 2f567679: am 2f48c4a7: Merge \"Check for invalid pointer index in PagedView\" into jb-mr2-dev\n\n* commit \u00272f567679f40ad0580928502972308ec540eeba3f\u0027:\n  Check for invalid pointer index in PagedView\n"
    },
    {
      "commit": "99f7fae55c932001ca7eecdb268972b2265c3991",
      "tree": "cd3f5552682e2454afc11cf944c7abbdb230bae7",
      "parents": [
        "a5ca95a889236e72f08033bab426c8acee35ce90"
      ],
      "author": {
        "name": "Amith Yamasani",
        "email": "yamasani@google.com",
        "time": "Mon May 13 16:08:31 2013 -0700"
      },
      "committer": {
        "name": "Amith Yamasani",
        "email": "yamasani@google.com",
        "time": "Mon May 13 16:08:31 2013 -0700"
      },
      "message": "Fix user icon loading\n\nWas broken by a recent merge from mr2.\n\nChange-Id: I063e0a5e08615f7b47d3861796985f4aeec23537\n"
    },
    {
      "commit": "08763af07e9f6f2c9dd0d4b5e73f9c341c628b84",
      "tree": "96a9aa51ed80326d3be6fbfb4f4bfbdbde87ce15",
      "parents": [
        "fee8cd75823413a28f004d13e1f25a8954ac2900",
        "8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri May 10 03:06:38 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri May 10 03:06:38 2013 -0700"
      },
      "message": "am 8f1b2e0b: am 00553835: Merge \"Attempt to fix NPE in keyguard\" into jb-mr2-dev\n\n* commit \u00278f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e\u0027:\n  Attempt to fix NPE in keyguard\n"
    },
    {
      "commit": "e8e93a143eaec158450c146e96e8fe05fd2401e7",
      "tree": "20a904323fdc38b7176c1fd33fde8ec846ef16ef",
      "parents": [
        "89efc6e6c1bba5866e7bdb1bb9e009022ec9d691"
      ],
      "author": {
        "name": "Amith Yamasani",
        "email": "yamasani@google.com",
        "time": "Thu May 09 18:12:30 2013 -0700"
      },
      "committer": {
        "name": "Amith Yamasani",
        "email": "yamasani@google.com",
        "time": "Thu May 09 18:12:30 2013 -0700"
      },
      "message": "Fix build error due to incorrect merge\n\nKeyguard package was moved, so a new file didn\u0027t get to the right directory.\n\nChange-Id: I2cdf2d9ef785ca7852c38278f51b5af9f96320f7\n"
    },
    {
      "commit": "ecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4",
      "tree": "66a1d61588c842837f1bc4b8d81675f3aa33d90f",
      "parents": [
        "2d4edcf2e1ef94ef83e02ec2ad075b3603282812",
        "069d7e9b81e17d31238e4d60420c3e31bb5e3b2f"
      ],
      "author": {
        "name": "Amith Yamasani",
        "email": "yamasani@google.com",
        "time": "Thu May 09 17:01:12 2013 -0700"
      },
      "committer": {
        "name": "Amith Yamasani",
        "email": "yamasani@google.com",
        "time": "Thu May 09 17:07:08 2013 -0700"
      },
      "message": "resolved conflicts for merge of 069d7e9b to master\n\nChange-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877\n"
    },
    {
      "commit": "c0b676dcc23baedb12946c3470d9fa9b02cb39e0",
      "tree": "a0050fe524ddbbdd56bd81ea7c67b3a7dd248c69",
      "parents": [
        "69fd7bd660a3a2d1b4c260eee9bbc6868b47d0c4"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Mar 22 16:11:08 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Fri Apr 26 14:34:21 2013 -0700"
      },
      "message": "Add keyguard background scrim and protection around keyguard APIs\n\nWith this change, the system process will put up a scrim in the\nevent keyguard crashes to protect underlying content.\n\nIt also adds permission checks to prevent unathorized access\nthrough the binder APIs.\n\nCleaned up KeyguardTestActivity to build separately.\n\nRemoved unused resources.\n\nChange-Id: I9e370c6bfb7dca68eae9eae304c815fb84a753d2\n"
    },
    {
      "commit": "afab4fd00b0e045027442bfc43e9fb1afb56aa04",
      "tree": "408505eabbd34d669349b79b1191c6632cb3b16d",
      "parents": [
        "68a13f3df46d675671d08202e76f6f18d423fda7",
        "c6eeacd9341c0348c2eb29d1808eb17ea08464f4"
      ],
      "author": {
        "name": "Svetoslav",
        "email": "svetoslavganov@google.com",
        "time": "Thu Apr 25 17:14:33 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Apr 25 17:14:33 2013 -0700"
      },
      "message": "am c6eeacd9: am c38bc5ab: Merge \"Lockscreen widgets not always announced.\" into jb-mr2-dev\n\n* commit \u0027c6eeacd9341c0348c2eb29d1808eb17ea08464f4\u0027:\n  Lockscreen widgets not always announced.\n"
    },
    {
      "commit": "6168317f31d45cb4dad9d24d4b68cf6e7c40565a",
      "tree": "742050be629e7264dcc97736717cd21121b1db18",
      "parents": [
        "8fbe05fb8686142f4f594034b984329d04214b7e",
        "7b2ad857a8a88c0688224d7236ba171f11cda586"
      ],
      "author": {
        "name": "Winson Chung",
        "email": "winsonc@google.com",
        "time": "Fri Apr 19 14:25:58 2013 -0700"
      },
      "committer": {
        "name": "Winson Chung",
        "email": "winsonc@google.com",
        "time": "Fri Apr 19 14:25:58 2013 -0700"
      },
      "message": "resolved conflicts for merge of 7b2ad857 to master\n\nChange-Id: I72472e56b2303aa6ccabd784fadc7da4eabcb0e8\n"
    },
    {
      "commit": "3569e9e50c3a467e9094d24272b8e1f091ac8d86",
      "tree": "7fa2be369e3ad247c0f70f5715f87bc697ed1593",
      "parents": [
        "c1ce6e1a795935a9dfb34878370706e301758baf",
        "2f6a2526db3f786b460f700edece62c58e2722ca"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Apr 17 14:18:56 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Apr 17 14:18:56 2013 -0700"
      },
      "message": "resolved conflicts for merge of 2f6a2526 to master\n\nChange-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a\n"
    },
    {
      "commit": "647e4b82fea7e566b7173a9398150f1e26f5834f",
      "tree": "32b5ae8ca3bb2af5f3b75c80af8141965dda3728",
      "parents": [
        "18197ec438ea57b2b0bc2847e7f6d903137f9e8c",
        "df6db6adc2fd09da77a028539e802e69d0a8d6a1"
      ],
      "author": {
        "name": "Brian Colonna",
        "email": "bcolonna@google.com",
        "time": "Mon Apr 15 14:27:40 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Apr 15 14:27:40 2013 -0700"
      },
      "message": "am df6db6ad: am 3f1375e5: Merge \"Enabling Face Unlock for user switching (bug 8495282)\" into jb-mr2-dev\n\n* commit \u0027df6db6adc2fd09da77a028539e802e69d0a8d6a1\u0027:\n  Enabling Face Unlock for user switching (bug 8495282)\n"
    },
    {
      "commit": "c8c0d0964e1efa666698198920665aa539398468",
      "tree": "fb7af38191f5428ba43ef822fa40c7d0a1a196c1",
      "parents": [
        "886d91b60586c8d11a236379fbf7ea13e4f34136",
        "cce961c13417eeafba78fd5f785984b54997d897"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Apr 11 15:43:49 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Apr 11 15:43:49 2013 -0700"
      },
      "message": "am cce961c1: am 22626107: Merge \"Fix bug where transport shows all the time in keyguard\" into jb-mr2-dev\n\n* commit \u0027cce961c13417eeafba78fd5f785984b54997d897\u0027:\n  Fix bug where transport shows all the time in keyguard\n"
    },
    {
      "commit": "3f4e82b1909615f5c75d84104cb09e019c8bfdae",
      "tree": "697835f044a7658b8d89fe9b3f83dbfb403f0820",
      "parents": [
        "e775cee1763610a0be6ad89baefdea5714cd9952",
        "3ef8f64d3faac1b110c737e69472be710d07d158"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Apr 10 17:25:11 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Apr 10 17:25:11 2013 -0700"
      },
      "message": "am 3ef8f64d: am 5c58a916: Merge \"Fix missing clock in keyguard\" into jb-mr2-dev\n\n* commit \u00273ef8f64d3faac1b110c737e69472be710d07d158\u0027:\n  Fix missing clock in keyguard\n"
    },
    {
      "commit": "314b25d0fd9fae7eff7930fef32458518e8a227d",
      "tree": "7df539e6fcace5cbd40a0d4d4c5d094713e07c11",
      "parents": [
        "490b579123d4ce6119870504cd3e55929ae16b86",
        "ca762beea440ec497fd8d6f6f50ac0904a2b0a05"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Wed Apr 03 14:58:48 2013 -0700"
      },
      "committer": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Wed Apr 03 14:58:48 2013 -0700"
      },
      "message": "resolved conflicts for merge of ca762bee to master\n\nChange-Id: Ib57124c30352b4f6ed66f384b386eb6f49b505c1\n"
    },
    {
      "commit": "f0426c6a44bbce7d4e92f6dc55ac0e02b72a57bd",
      "tree": "1b0b3d0564dc9ac85d943acec3541b748aab0d00",
      "parents": [
        "87290ccdc2ae23c63f309c485c8f684bb1ab8865",
        "e884f6b8505520f6f745cc51358154bf5d89f101"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Apr 02 19:25:17 2013 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 02 19:25:17 2013 -0700"
      },
      "message": "am e884f6b8: am dbd9c337: Merge \"Change time format for default clock in keyguard\" into jb-mr2-dev\n\n* commit \u0027e884f6b8505520f6f745cc51358154bf5d89f101\u0027:\n  Change time format for default clock in keyguard\n"
    },
    {
      "commit": "c849fbcf3ddd3cbb08840c72f7f325294c5d2802",
      "tree": "d57bec7d67b3d4a61e10a9575d7e634ed78f7bc0",
      "parents": [
        "4c6b3b1f2ba720124a784b181d34c0454e259446",
        "5856ee4bd620fcbabc5f52651875d034d1513c5b"
      ],
      "author": {
        "name": "Brian Colonna",
        "email": "bcolonna@google.com",
        "time": "Tue Apr 02 17:16:55 2013 -0400"
      },
      "committer": {
        "name": "Brian Colonna",
        "email": "bcolonna@google.com",
        "time": "Tue Apr 02 17:16:55 2013 -0400"
      },
      "message": "resolved conflicts for merge of 5856ee4b to master\n\nChange-Id: I60ba85bc246b9cf25d467b2099535aad47f82ca7\n"
    },
    {
      "commit": "7678a7beea7d457d20c60dc226328fd2252214ef",
      "tree": "0a7d06e9171f0b277108e87e1cd41e9e9435f418",
      "parents": [
        "d3289c60837db6891f30381687223da992ad71e2",
        "99bd302cfef0a3cf9fe6874cc9379869b5f50462"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Fri Mar 29 14:30:34 2013 -0700"
      },
      "committer": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Fri Mar 29 14:30:34 2013 -0700"
      },
      "message": "resolved conflicts for merge of 99bd302c to master\n\nChange-Id: I858f67d0c61f6403b336c82a300f69027fc16bd1\n"
    },
    {
      "commit": "52452484527238222f03dc9f4bc3018608167306",
      "tree": "a368c4b20548ca3ca3c7f5fd44f6efe256c8fd31",
      "parents": [
        "47f1bea9da873dcb04165553286ad45bc88a1e88",
        "2d9305ccc28f00f5263bcaa5cd033ee22ccc8d0b"
      ],
      "author": {
        "name": "John Spurlock",
        "email": "jspurlock@google.com",
        "time": "Thu Mar 21 08:27:58 2013 -0400"
      },
      "committer": {
        "name": "John Spurlock",
        "email": "jspurlock@google.com",
        "time": "Thu Mar 21 08:27:58 2013 -0400"
      },
      "message": "resolved conflicts for merge of 2d9305cc to master\n\nChange-Id: I9a9672314ef95af09e3f416fa1dc200f7a9d8d4e\n"
    },
    {
      "commit": "5950bf3a47661caa081f00dbde7c6d3b448eddda",
      "tree": "146e16282a4b7fc551297b13f18fc282c9b19e09",
      "parents": [
        "84226e908d19869ca2529a95eb32f404020e6658",
        "7d7443bcb98980e30d7da4eb4b260b6d0bc4705d"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Mar 19 17:15:43 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Mar 19 17:37:43 2013 -0700"
      },
      "message": "resolved conflicts for merge of 7d7443bc to master\n\nChange-Id: I5d777dad0fb4019c1f718c4109c5c973eeac8840\n"
    },
    {
      "commit": "ef9f5276f250312cfcfe6a377feb2aa022495a4e",
      "tree": "d6f85f8841ee2244d8aa3c8033f92c5a494641e9",
      "parents": [
        "f6b40944e9d03c54a1449401605f9d6d42112bc1",
        "e8b24ddd6769a431b8fa3462e00c85211787a08d"
      ],
      "author": {
        "name": "John Spurlock",
        "email": "jspurlock@google.com",
        "time": "Thu Mar 14 19:59:58 2013 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Mar 14 19:59:58 2013 +0000"
      },
      "message": "am e8b24ddd: am adb9554d: Merge \"Enable back button in keyguard security account mode.\" into jb-mr2-dev\n\n* commit \u0027e8b24ddd6769a431b8fa3462e00c85211787a08d\u0027:\n  Enable back button in keyguard security account mode.\n"
    },
    {
      "commit": "aa2e84f29b57314f57cae09de94e49bc6cfa77ef",
      "tree": "17816dceb7d3fa0fb72ce65b4ef4cc1a28331d5f",
      "parents": [
        "bbaa7c129655795eb2f1d943d9e93c4236f4d5a7",
        "3fe0205a00672ccc86f7ca3fc8980fc380891fce"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Mar 14 02:34:43 2013 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Mar 14 02:34:43 2013 +0000"
      },
      "message": "am 3fe0205a: am 6d4dac74: Merge \"Fix bug where Keyguard\\\u0027s emergencydialer wasn\\\u0027t being launched with a userid.\" into jb-mr2-dev\n\n* commit \u00273fe0205a00672ccc86f7ca3fc8980fc380891fce\u0027:\n  Fix bug where Keyguard\u0027s emergencydialer wasn\u0027t being launched with a userid.\n"
    },
    {
      "commit": "34f09eaf0318cf5cf852483423851584ada039c8",
      "tree": "141251333d57ad67eb978116ccc06b8156b9af87",
      "parents": [
        "23a16804494a55dc18f5088beb54192e10a4f596",
        "8f4772feb411a2b8bf6016038b39df1d49d81c95"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Mar 12 19:19:27 2013 -0700"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Tue Mar 12 19:19:27 2013 -0700"
      },
      "message": "resolved conflicts for merge of 8f4772fe to master\n\nChange-Id: I65cb4a9b3f339ad4b6997d71dc5f4577c03bb026\n"
    },
    {
      "commit": "8fac5869d460cad3432c2805edb79c5be9114e82",
      "tree": "747390ccec080b420722b2487af6ef5d6ab9e9f8",
      "parents": [
        "c1059ca337bce554056467dc79de6aecf4569f9e",
        "0e23dd635aae47463fa457c43938898babd7e42c"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Tue Mar 12 16:49:13 2013 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Mar 12 16:49:13 2013 +0000"
      },
      "message": "am 0e23dd63: am 998b692d: Merge \"Keyguard remote control display artwork size\" into jb-mr2-dev\n\n* commit \u00270e23dd635aae47463fa457c43938898babd7e42c\u0027:\n  Keyguard remote control display artwork size\n"
    },
    {
      "commit": "17f509aefe98f448f8f0692321415eb0ac0abc2e",
      "tree": "3628ac1058ad143412e10ad99f605b1b0e39bca2",
      "parents": [
        "83178a67917d84d2afd12dcc800ffc5e1a9e3634"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Feb 28 18:36:12 2013 -0800"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Feb 28 18:36:12 2013 -0800"
      },
      "message": "Re-enable USER_PRESENT broadcast in keyguard.\n\nChange-Id: I0a1983d07bd81d3edf2b8bcb5e81e48613fc4205\n"
    },
    {
      "commit": "25190577cc69eaa5930c6fbdc2fcca03afc84982",
      "tree": "6e0679b910c2949f5cd66e1ac0e7d70acef9ed41",
      "parents": [
        "32e18d9f325d8ba59d90505008578f9448031496"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Feb 28 17:36:24 2013 -0800"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Feb 28 17:41:34 2013 -0800"
      },
      "message": "Post-review Keyguard cleanup.\n\n- remove userActivity() from KeyguardService interface and call it\non PowerManager directly\n- Split IKeyguardResult into two parts: IKeyguardShowCallback and\nIKeyguardExitCallback.\n- Misc other changes from the review.\n\nChange-Id: I3f679cfa5d3f8bc742f2b2259ac354045e89a87b\n"
    },
    {
      "commit": "6486588e400618568e1cd5b204ae89a43172ee00",
      "tree": "26eff21d99719b608d1ad0223f6cc024b9ff4c3f",
      "parents": [
        "c458b7f8d3426a6ac5caf77842de5f1d433f43ff",
        "195b551761773912196a10e6d84109027d470eb8"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Feb 28 22:09:41 2013 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Feb 28 22:09:41 2013 +0000"
      },
      "message": "Merge \"Fix dependency between keyguard/dexopt/AccessibilityManagerService.\""
    },
    {
      "commit": "195b551761773912196a10e6d84109027d470eb8",
      "tree": "7d8013ee182ccf8aa6cb107d8f1696137e7e21e6",
      "parents": [
        "1430193df4ea1b7e6a72c9a299dff3edcb880b0f"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Feb 28 03:35:57 2013 -0800"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Thu Feb 28 13:40:49 2013 -0800"
      },
      "message": "Fix dependency between keyguard/dexopt/AccessibilityManagerService.\n\nThis fixes a bug on userdebug builds where dexopt hadn\u0027t completed\nbefore the service is needed.  The resulting crash prevented dexopt\nfrom completing, resulting in a reboot loop and perpetual issue starting\nthe service.\n\nThe solution is to hold off on creating keyguard until the system is ready.\n\nIt also moves the creation of the AccessibilityManagerService singleton back\ninto the system process.\n\nFixes bug 8287106\n\nChange-Id: I96e15c084d38c255fd8f6bca6f21a0785b82ec74\n"
    },
    {
      "commit": "105beddcb98efc24f37259881d9b4c267aa0d198",
      "tree": "454c088b39fe731f144d888f539a243226b5e31a",
      "parents": [
        "1430193df4ea1b7e6a72c9a299dff3edcb880b0f"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Feb 27 21:35:18 2013 -0800"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Feb 27 21:35:18 2013 -0800"
      },
      "message": "Fix bad merge in KeyguardHostView\n\nThis restores the fix detailed in Change-Id: I866d4b42493df3a6449d8eabc3ea140dc39dac57\n\nChange-Id: Ibe75afd7a612cf96a56e5815a198c2047c7ff5bd\n"
    },
    {
      "commit": "5ecd81154fa039961f65bb4e36d18ac555b0d1d6",
      "tree": "ce0d9d0e4ade28d865fb5005fa03fed78ad9ff91",
      "parents": [
        "25a272a9f6323f6a3513bb522d45e839449878ce"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Jan 09 18:50:26 2013 -0800"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Feb 27 17:27:53 2013 -0800"
      },
      "message": "Move keyguard to its own process.\n\nThis is in preparation to moving keyguard into its own process.\n\nMoved keyguard source and resources into new .apk.\n\nGot basic test app working.  Still need to implement MockPatternUtils\nand means to pass it into KeyguardService with local binder interface.\n\nAdded new ACCESS_KEYGUARD_SECURE_STORAGE permission.\n\nTemporarily disabled USER_PRESENT broadcast.\n\nRemove unintentional whitespace changes in PhoneWindowManager, etc.\n\nCheckpoint basic working version.\n\nMove to systemui process.\n\nSynchronize with TOT.\n\nSync with recent user API changes.\n\nFix bug with returing interface instead of stub for IKeyguardResult.  Create KeyguardServiceDelegate to allow\nfor runtime-selectable local or remote interface.\n\nMore keyguard crash robustness.\n\nKeyguard crash recovery working.  Currently fails safe (locked).\n\nFix selector view which was still using frameworks resources.\n\nRemove more references to internal framework variables.  Use aliases for those we should move but\ncurrently have dependencies.\n\nAllow runtime switching between service and local mode.\n\nFix layout issue on tablets where orientation was reading the incorrect constant\nfrom the framework.  Remove more framework dependencies.\n\nFix PIN keyboard input.\n\nRemove unnecessary copy of orientation attrs.\n\nRemove unused user selector widget and attempt to get multi user working again.\n\nFix multi-user avatar icon by grabbing it from UserManager rather than directly since\nkeyguard can no longer read it.\n\nMerge with AppWidget userId changes in master.\n\nChange-Id: I254d6fc6423ae40f6d7fef50aead4caa701e5ad2\n"
    },
    {
      "commit": "25a272a9f6323f6a3513bb522d45e839449878ce",
      "tree": "383249596b1d41e7643c38071789eca108c4db5e",
      "parents": [
        "2973ccdba848b03cabba95f2b8eeae1b4204713e"
      ],
      "author": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Jan 09 18:50:26 2013 -0800"
      },
      "committer": {
        "name": "Jim Miller",
        "email": "jaggies@google.com",
        "time": "Wed Feb 27 17:26:43 2013 -0800"
      },
      "message": "Move keyguard source and resources into new package\n\nThis is part 1 of two commits.  This commit moves all keyguard\nsource and resources to a new com.android.keyguard package.\nThe second part of this change applies an overlay that makes\nit work.\n\nChange-Id: I360e9ac7783c6cb289c992733818b9535df185b9\n"
    }
  ]
}