)]}' { "log": [ { "commit": "8c1f9360ce12e43cb18e1569b59f6b1674e9ea86", "tree": "cd8e35dd8e9234189420872e1a5f6f74b48cb961", "parents": [ "f9b4c2cc6ffbcb21f8e9b015ed3bdab0501bdf65" ], "author": { "name": "Raph Levien", "email": "raph@google.com", "time": "Thu Aug 07 13:52:37 2014 -0700" }, "committer": { "name": "Raph Levien", "email": "raph@google.com", "time": "Thu Aug 07 20:57:32 2014 +0000" }, "message": "Add new fonts.xml\n\nThis adds a new configration file for fonts with several more features,\nmost notably the ability to specify numeric weights for fonts in a\nfamily, and specify aliases for weights. This will help help choose an\nappropriate font for a \"bold\" weight request, rather than just applying\nauto-bolding.\n\nBug: 14538154\nChange-Id: Ib4d54d66a0c68b7d46e665d7cd94e97b72468e95\n" }, { "commit": "f9b4c2cc6ffbcb21f8e9b015ed3bdab0501bdf65", "tree": "1ee3b86b8cc0efff494baf4c339c6be79a6e1ea4", "parents": [ "cd3a994e5067db8dd0edd45ac4ff8a64387ff7fc", "ac1f5884fb171f8a81819e9c0ce3402ad621f534" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 20:56:55 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 06 23:49:20 2014 +0000" }, "message": "Merge \"Fix CTS test for nine patch padding sanity check\" into lmp-dev" }, { "commit": "ac1f5884fb171f8a81819e9c0ce3402ad621f534", "tree": "74ecebdeab602bb87e0749dd0b1be08fa19e989a", "parents": [ "bcc48b6cb09fda744b64d15b02f6e5c5fcfc9b7d" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:55:26 2014 -0700" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:55:26 2014 -0700" }, "message": "Fix CTS test for nine patch padding sanity check\n\nBUG: 16826969\nChange-Id: I96628a38300dec58eb8523559741c28fed35eba2\n" }, { "commit": "cd3a994e5067db8dd0edd45ac4ff8a64387ff7fc", "tree": "8f8f592b84e686f98aa6daf1f326ee7a184df4f4", "parents": [ "e46a9b97fbd1fccaa398a16bc9c2e5192977f439", "0a1ef4dbf39aa3dfae1a91daf972ae3457ce27fe" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Aug 07 20:51:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 17:50:16 2014 +0000" }, "message": "Merge \"camera2: (LEGACY) Add face detection support and vstab modes\" into lmp-dev" }, { "commit": "0a1ef4dbf39aa3dfae1a91daf972ae3457ce27fe", "tree": "6ef00d91225719fb6a947637dc69ad1e198146d0", "parents": [ "733341bf0db89c93ee1341ddfca9b0c49731c836" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Jul 31 15:53:34 2014 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Aug 07 13:46:25 2014 -0700" }, "message": "camera2: (LEGACY) Add face detection support and vstab modes\n\nAlso work-around CTS freezing forever in Camera#setPreviewTexture\n\n* Set preview texture to null after unconfiguring (Camera#stopPreview)\n* Remove all uses of recording hint\n\n(Some devices disable face detection unconditionally when recording is not\nusing HDR mode; recording hints will be introduced after we add\ncapture intent support)\n\nChange-Id: I2f0a80f1d580af214cb0f53abcbf33c7391790f1\n" }, { "commit": "e46a9b97fbd1fccaa398a16bc9c2e5192977f439", "tree": "43a80048ca6dd7b1cd005c14c795a341e77a1c03", "parents": [ "7870dfe361d8ddfdb2e565c696254c57aa39c625", "2c18333577059663b1d89a86752f382b052ca3f8" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 20:46:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:00:45 2014 +0000" }, "message": "Merge \"Remove clipToOutline workaround for null backgrounds\" into lmp-dev" }, { "commit": "2c18333577059663b1d89a86752f382b052ca3f8", "tree": "1d963f44ba748502ca784669a20065a7a60dd5a4", "parents": [ "bcc48b6cb09fda744b64d15b02f6e5c5fcfc9b7d" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:43:05 2014 -0700" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:43:05 2014 -0700" }, "message": "Remove clipToOutline workaround for null backgrounds\n\nBUG: 16566746\nChange-Id: Icdf0d40b75c0fa9d972eb6300f51079e48fbe5fd\n" }, { "commit": "7870dfe361d8ddfdb2e565c696254c57aa39c625", "tree": "94f30649d8b3ca1f980422b3c2a84b8d4a16a9e8", "parents": [ "95202de09de7abf9e847e9d7f38388b492336154", "271ed9ae870f3a9cbe339161748aa553a87fe2e9" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 20:40:03 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 17:50:16 2014 +0000" }, "message": "Merge \"Use translatable strings for time picker AM/PM labels\" into lmp-dev" }, { "commit": "271ed9ae870f3a9cbe339161748aa553a87fe2e9", "tree": "2073158e283ebf65b3f673963326ed9b2fe7adb6", "parents": [ "bcc48b6cb09fda744b64d15b02f6e5c5fcfc9b7d" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:33:30 2014 -0700" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:33:30 2014 -0700" }, "message": "Use translatable strings for time picker AM/PM labels\n\nBUG: 16842390\nChange-Id: Ibdbe9cffb39373f200a09eb0d28b956a1eeb5d13\n" }, { "commit": "95202de09de7abf9e847e9d7f38388b492336154", "tree": "b82db041d8178fec649698b52845259515adcfc6", "parents": [ "11e84ce024e763d16108e49e96f65657b70c7585", "559b41f42455377c70ac5a1a10516cd34e9324ae" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 20:38:02 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 18:49:59 2014 +0000" }, "message": "Merge \"Fix pending dismiss action not cleared when leaving bouncer\" into lmp-dev" }, { "commit": "559b41f42455377c70ac5a1a10516cd34e9324ae", "tree": "6aebe101caa229547b9bfd24e4c5ebe4f2fd49b6", "parents": [ "09723fd04a8c2d0198ee11aeab1a9eefcf17ca7f" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 22:25:55 2014 +0200" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 22:27:56 2014 +0200" }, "message": "Fix pending dismiss action not cleared when leaving bouncer\n\nBug: 16307958\nChange-Id: Id9ae360b6d4f606b3b76a092b32756ac04d06344\n" }, { "commit": "11e84ce024e763d16108e49e96f65657b70c7585", "tree": "d4f13be161e103963fdcf231f3ae653259c99f21", "parents": [ "47082b9c7ee11ce1d1fd266d715b5b30fb759f4a", "036a66596dba32c051a016ca9b5334fbbd39c220" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 20:35:36 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 17:50:16 2014 +0000" }, "message": "Merge \"Add an extra pixel to the ripple radius used for bounds\" into lmp-dev" }, { "commit": "036a66596dba32c051a016ca9b5334fbbd39c220", "tree": "b6e05d383ff590e539af308522aa4780ffba2bd4", "parents": [ "bcc48b6cb09fda744b64d15b02f6e5c5fcfc9b7d" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:00:03 2014 -0700" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Aug 07 13:00:03 2014 -0700" }, "message": "Add an extra pixel to the ripple radius used for bounds\n\nBUG: 16850241\nChange-Id: I0f3a046100c104a6321ca7eb24cd0295878e4f47\n" }, { "commit": "47082b9c7ee11ce1d1fd266d715b5b30fb759f4a", "tree": "968800eb2b497087b11966fe65b736b2f2ac043c", "parents": [ "d3ea7d61a31d8719da3c809ebc28ece3eafd5b85", "d3b85f69a811113826933c8abf591f20e9b3c8ff" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 07 20:17:59 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:00:45 2014 +0000" }, "message": "Merge topic \u0027camera2-remove-hidden\u0027 into lmp-dev\n\n* changes:\n Camera2: Fix session shutdown race, frequent warning log\n Camera2: Remove hidden parts of public CameraDevice\n Camera2: Fix null-listener capture for CameraCaptureSession\n" }, { "commit": "d3b85f69a811113826933c8abf591f20e9b3c8ff", "tree": "4e5994493e455aa28bc38538fbcb1e8875a4162b", "parents": [ "a6b5ba56036f19bdd816ef03ad37beccf0150050" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Aug 05 15:02:31 2014 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 07 13:16:53 2014 -0700" }, "message": "Camera2: Fix session shutdown race, frequent warning log\n\n- Make sure that session.close followed by device.createCaptureSession cannot race on\n configureOutputs calls\n- Silence warning about RAW_OPAQUE format\n\nChange-Id: I02e4a048e8b26ea61aadcf115b029e9fbb58ad4e\n" }, { "commit": "a6b5ba56036f19bdd816ef03ad37beccf0150050", "tree": "b4646dcc0dfafe53652f9083f44bb1e78701288f", "parents": [ "7875a886b8397684c5fac3dd022d19de9874b436" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jul 02 16:30:53 2014 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 07 13:16:53 2014 -0700" }, "message": "Camera2: Remove hidden parts of public CameraDevice\n\n- Remove everything @hide in CameraDevice\n- Move bits that are still needed into CameraDeviceImpl\n\nChange-Id: Ie22059a0eb5c4238142a8a1e8dbcf1a422e845aa\n" }, { "commit": "7875a886b8397684c5fac3dd022d19de9874b436", "tree": "811da1ebc733277e9b095e73ee662eb29f3eb780", "parents": [ "6720be4e8c65e90d4453ddad5cef192bc3820038" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jul 31 12:47:07 2014 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 07 13:16:22 2014 -0700" }, "message": "Camera2: Fix null-listener capture for CameraCaptureSession\n\nCorrectly allow null listener/handler when invoked on a thread with no\nlooper; otherwise all capture/repeating requests will fail even if listener\nis null.\n\nChange-Id: I4c64c81ad7f14b5cb309b4f92822cb50dbd74ba6\n" }, { "commit": "d3ea7d61a31d8719da3c809ebc28ece3eafd5b85", "tree": "7655e3a68bfedf7e311c0db181b459c0eac40a07", "parents": [ "6720be4e8c65e90d4453ddad5cef192bc3820038" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Aug 07 16:08:28 2014 -0400" }, "committer": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Aug 07 20:09:39 2014 +0000" }, "message": "Update strings for QS footer.\n\nBug: 16854706\nChange-Id: Iba7ecae45f0bc9a8819f5172ad5922fddab95076\n" }, { "commit": "6720be4e8c65e90d4453ddad5cef192bc3820038", "tree": "8262673e0a2c54e58011025e609f668d5ae650b3", "parents": [ "d5324e4183c97ae7271b6eda4204d9f0dc003023" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Tue Jul 29 19:14:16 2014 -0700" }, "committer": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Thu Aug 07 20:07:04 2014 +0000" }, "message": "Allow media projections to create public presentations.\n\nChange-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd\n" }, { "commit": "d5324e4183c97ae7271b6eda4204d9f0dc003023", "tree": "ac70c881e87a83edf2a468b6e2ba9ed3be895a47", "parents": [ "bcc48b6cb09fda744b64d15b02f6e5c5fcfc9b7d" ], "author": { "name": "Prerepa Viswanadham", "email": "dham@google.com", "time": "Thu Aug 07 09:44:20 2014 -0700" }, "committer": { "name": "Prerepa Viswanadham", "email": "dham@google.com", "time": "Thu Aug 07 19:51:59 2014 +0000" }, "message": "OnLost/OnFound integration - onfound match is done in framework,\nwhereas hw signal is used to report onlost.\n\nBug 16733710\n\nChange-Id: I7b177b7afd730341c336818857436c095735b53b\n" }, { "commit": "09723fd04a8c2d0198ee11aeab1a9eefcf17ca7f", "tree": "b4a5168202226fbc87b69a84d7df5d728dc9e6b7", "parents": [ "5f2220df7f40154be5d4585c304cd2f0770068ff", "aa21e395f536738f1f7dee01d752d69f2dff632e" ], "author": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Thu Aug 07 14:12:47 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 09:28:12 2014 +0000" }, "message": "Merge \"Need to post-process all action icons to get the correct color.\" into lmp-dev" }, { "commit": "bcc48b6cb09fda744b64d15b02f6e5c5fcfc9b7d", "tree": "2c3b7272f30ae9c2accc4fc151d157a3e3b03871", "parents": [ "3432720bf9bf2b6010d47866bf6096a607fa978b", "d5cf722ae62d06d1fb6a9505c6f4c403a5d14a37" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Aug 07 19:44:02 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 06 23:49:20 2014 +0000" }, "message": "Merge \"Reify the transport lookup/selection API\" into lmp-dev" }, { "commit": "d5cf722ae62d06d1fb6a9505c6f4c403a5d14a37", "tree": "d634f3be2239d07f9f4a5eda8abdf9a4eafb117d", "parents": [ "df192a47fc9d415f9c7b0c786d05c25f34e725f6" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Jul 29 16:53:09 2014 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@android.com", "time": "Thu Aug 07 19:43:22 2014 +0000" }, "message": "Reify the transport lookup/selection API\n\nIntroduce a stable BackupTransport interface class for transport\nimplementations to derive from.\n\nMake the interface for viewing/selecting the active backup transport\npart of the stable API.\n\nMake restore-related classes (RestoreSession, RestoreSet) stable API.\n\nExpress backup manager APIs needed for transport operation as\n@SystemApi methods in BackupManager.\n\nBug 16661321\n\nChange-Id: I423b87ae8f45c1b77831d4f8ffd97715484c2d2b\n" }, { "commit": "df192a47fc9d415f9c7b0c786d05c25f34e725f6", "tree": "f2b5e1d1d065a4d50a7861defc522034a032493b", "parents": [ "ec2332121bfc43988ef77f66c90d1695aab0b92d", "9a35d78cad1a4cf9639053c24139147e658ec055" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 07 19:38:50 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 18:53:12 2014 +0000" }, "message": "Merge \"Fix to call VoiceInteractionSession.onDestroy().\" into lmp-dev" }, { "commit": "9a35d78cad1a4cf9639053c24139147e658ec055", "tree": "d58b870a383c52ef2ca333509d35012e58be55c3", "parents": [ "0068d3dcf1f1a804554a1a09e3b173ac12651786" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 07 12:34:37 2014 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 07 12:34:37 2014 -0700" }, "message": "Fix to call VoiceInteractionSession.onDestroy().\n\nChange-Id: I2b4f19538700c691dac3a83aadfa0959ef1fe458\n" }, { "commit": "0068d3dcf1f1a804554a1a09e3b173ac12651786", "tree": "b073dcfde3b56b73279144233c28aea488541a1a", "parents": [ "6b8556d2e320b631d3741bf064796efddb6e51df" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 06 19:20:25 2014 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 07 12:19:39 2014 -0700" }, "message": "Fix issue @16555033: Battery history overflowing too much\n\n- No longer track process starts/stops normally.\n- Increase buffer size to 256KB.\n- Buffer size increase requires reworking how battery stats\n are retrieved, since it is going to be hitting IPC limits.\n- Also, store the last full stats after a reset, to be reported\n at the next checkin.\n- Also, discharge and charge times are tagged with the screen\n and battery save state during that time.\n\nChange-Id: Ie108ac9b626846108a9bb858101ac2b93276ac16\n" }, { "commit": "6b8556d2e320b631d3741bf064796efddb6e51df", "tree": "0117c3495820a01f0b30045d3f6c4f6c07f3018f", "parents": [ "f30fc111a3a65f9c3fb9384c867de1bbfe37b1e5" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Wed Aug 06 19:47:25 2014 -0700" }, "committer": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 12:10:48 2014 -0700" }, "message": "Dump the state of SoundTriggerHelper for bugreports\n\nChange-Id: I01a17d969fbd22c6bcbb161e3542ca14a3f8c7c8\n" }, { "commit": "ec2332121bfc43988ef77f66c90d1695aab0b92d", "tree": "18a0313ccddefa7121ba7c5e76fa6572395b25da", "parents": [ "0068d3dcf1f1a804554a1a09e3b173ac12651786", "6f03023ece076d33d8b171d5398c8ed70abf3f54" ], "author": { "name": "Behdad Esfahbod", "email": "behdad@google.com", "time": "Thu Aug 07 19:32:12 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 18:49:59 2014 +0000" }, "message": "Merge \"Remove dependency on SkPaintOptionsAndroid\" into lmp-dev" }, { "commit": "6f03023ece076d33d8b171d5398c8ed70abf3f54", "tree": "30873f8ee1155a24d9ff518517a5c63e97e4669b", "parents": [ "ae267d20c6d2c6b848193e8ec9a29ad47545339c" ], "author": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Thu Aug 07 08:10:39 2014 -0400" }, "committer": { "name": "Behdad Esfahbod", "email": "behdad@google.com", "time": "Thu Aug 07 14:38:51 2014 -0400" }, "message": "Remove dependency on SkPaintOptionsAndroid\n\nChange-Id: I579a3503697efe3b8fd9bc809a6c9bfbf735cb1b\n" }, { "commit": "f30fc111a3a65f9c3fb9384c867de1bbfe37b1e5", "tree": "da72b073fb097ecd040fc29ea6c7c3ddedea4f09", "parents": [ "8abea424907159dcb0c8d551ccc0bbbec83df806", "cb4e81c7fe1ec843d80f7604a688c71086c23685" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 19:09:41 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:42:44 2014 +0000" }, "message": "Merge \"Handle microphone contention/Phone calls while recognition is active\" into lmp-dev" }, { "commit": "cb4e81c7fe1ec843d80f7604a688c71086c23685", "tree": "c3ea65e45d02993cd7c3af55222c5cda5ec08998", "parents": [ "3da5ba05d601778ea11dd87c1e8c9e9827e2a520" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Tue Aug 05 15:03:46 2014 -0700" }, "committer": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 11:53:02 2014 -0700" }, "message": "Handle microphone contention/Phone calls while recognition is active\n\nInternally we pause the recognition when:\n - a phone call is active/off-hook/ringing\n - or some other application grabs the microphone\n\nwe auto-resume when the condition that caused us to pause reverses.\n\nBoth these events are notified to the client via callbacks so that they can choose to display on their UI,\nthat the recognition is paused for some reason.\n\nBug: 16515468\nBug: 16740806\nBug: 16514535\nChange-Id: Ib274d68522c8cf37d42402c875b16159957657f0\n" }, { "commit": "8abea424907159dcb0c8d551ccc0bbbec83df806", "tree": "62f9297d06596ff2f4027499517621237b6a97b3", "parents": [ "3da5ba05d601778ea11dd87c1e8c9e9827e2a520" ], "author": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Wed Aug 06 04:46:17 2014 -0700" }, "committer": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Thu Aug 07 11:37:52 2014 -0700" }, "message": "Remove ldaps from AOSP code.\n\nBug: 16327484\nChange-Id: I1fbeed8e1642e8228310cf0e7b95c4809b50901b\n" }, { "commit": "3da5ba05d601778ea11dd87c1e8c9e9827e2a520", "tree": "4b362a17a999d9340a38693e333824a832960f71", "parents": [ "57c84544d9468a3101bce4d4cb70c2994a126fd5", "db92e35211d875eab75787c593eea2988c8a560f" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 18:27:31 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:31:24 2014 +0000" }, "message": "Merge \"Fix build break\" into lmp-dev" }, { "commit": "db92e35211d875eab75787c593eea2988c8a560f", "tree": "ffe5bb459413e6bc5d2723d25c9324defd8a97eb", "parents": [ "256e1a62673472d685232d88ad4d067eb82deeac" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 11:23:03 2014 -0700" }, "committer": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 11:23:03 2014 -0700" }, "message": "Fix build break\n\nChange-Id: I7af700671f1a2e910b6e08498381c8adb40631f8\n" }, { "commit": "256e1a62673472d685232d88ad4d067eb82deeac", "tree": "3cc4215e2ae5cd94ee63b18b3be3069e93af5036", "parents": [ "a13104fe7d7317f3cf963302597a8db93ec11245" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Tue Aug 05 11:56:58 2014 -0700" }, "committer": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 10:50:18 2014 -0700" }, "message": "Handle same keyphrase for multiple users\n\nAlso notify the VIS of a change after finishing the change\n\nBug: 16816191\nChange-Id: I6c96595819cd07182c3825c522d9bae559bb6814\n" }, { "commit": "a13104fe7d7317f3cf963302597a8db93ec11245", "tree": "857616dddde0dc331a7c5d0b048f3a7f63689735", "parents": [ "9413b245a6e5264ce4e57c48a90ee96f914476e2", "2178e2e085056186141ac44563103c6f455de89c" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 17:49:29 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:31:24 2014 +0000" }, "message": "Merge \"Read audio format from the recognition event\" into lmp-dev" }, { "commit": "2178e2e085056186141ac44563103c6f455de89c", "tree": "7d6a6259f0d1cb53f8fe343e200bc3da2baf031e", "parents": [ "579befecb248162021929ab58ffd23f1724cc6be" ], "author": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Wed Aug 06 13:54:04 2014 -0700" }, "committer": { "name": "Sandeep Siddhartha", "email": "sansid@google.com", "time": "Thu Aug 07 10:48:51 2014 -0700" }, "message": "Read audio format from the recognition event\n\nBug: 16549061\nChange-Id: I9e418f7be67eb330b7bfaa97bbb90d0b5640469d\n" }, { "commit": "9413b245a6e5264ce4e57c48a90ee96f914476e2", "tree": "12cac7e54b4cdedfc76d1be5a543f42f3a484407", "parents": [ "579befecb248162021929ab58ffd23f1724cc6be" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Aug 06 17:34:24 2014 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Aug 07 10:24:04 2014 -0700" }, "message": "Nested pre-fling for AbsListView and ScrollView\n\nAdd nested pre-fling support to all framework widgets that currently\nsupport nested fling.\n\nChange-Id: Ieaf9d12938dbfeea779c2aee2f5a081c287c8e96\n" }, { "commit": "579befecb248162021929ab58ffd23f1724cc6be", "tree": "8c60b27255210c77a1cc4f3f99372910c4f2ecd9", "parents": [ "ae267d20c6d2c6b848193e8ec9a29ad47545339c" ], "author": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Wed Aug 06 19:18:37 2014 -0700" }, "committer": { "name": "Jae Seo", "email": "jaeseo@google.com", "time": "Thu Aug 07 10:00:52 2014 -0700" }, "message": "TIF: Do not log non-searchable channel watch history\n\nBug: 16798476\nChange-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986\n" }, { "commit": "57c84544d9468a3101bce4d4cb70c2994a126fd5", "tree": "c1850630d80fa0db923802334c1480629a59f2a4", "parents": [ "72af07503404018be289fa940de37c46984c090c", "ec396d6399c5c31d697d81e94aff459e9771b0c6" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Thu Aug 07 17:57:40 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:27:35 2014 +0000" }, "message": "Merge \"Initial changes to add task affiliation styling. (Bug 16656169)\" into lmp-dev" }, { "commit": "ec396d6399c5c31d697d81e94aff459e9771b0c6", "tree": "64dcf5b50fb9071079a2c7880a83863a370ba582", "parents": [ "256e1a62673472d685232d88ad4d067eb82deeac" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed Aug 06 17:08:00 2014 -0700" }, "committer": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Thu Aug 07 17:57:25 2014 +0000" }, "message": "Initial changes to add task affiliation styling. (Bug 16656169)\n\n- Fixing issue with launch-in-background animation\n" }, { "commit": "3432720bf9bf2b6010d47866bf6096a607fa978b", "tree": "6a27d8a754cbe53f21ed7add9b1a81229351be2c", "parents": [ "cbd7a6ecbb7aa5a4ea146cf05f1ec254eb3e60b9", "a2496de37abda981ba80d74f529943374c9d6e3d" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Aug 07 19:43:55 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:00:45 2014 +0000" }, "message": "Merge \"Make TrafficStats uid attribution @SystemApi\" into lmp-dev" }, { "commit": "a2496de37abda981ba80d74f529943374c9d6e3d", "tree": "f26735d8323a07344d841d0306e5b9dc434716c9", "parents": [ "df192a47fc9d415f9c7b0c786d05c25f34e725f6" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Wed Aug 06 14:19:56 2014 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@android.com", "time": "Thu Aug 07 19:43:20 2014 +0000" }, "message": "Make TrafficStats uid attribution @SystemApi\n\nAnything that runs as a singleton may need to attribute traffic to\nvarious client apps; in particular, backup transports need to do this.\nApropos of which, introduce a @SystemApi method specifically for that\npurpose, setThreadStatsTagBackup().\n\nBug 16661321\n\nChange-Id: Id5d22e28bdc68edb53f2a1fdba80b144fcbc61d2" }, { "commit": "cbd7a6ecbb7aa5a4ea146cf05f1ec254eb3e60b9", "tree": "9f242481aa059169362fb7598cac5a786913a4d9", "parents": [ "df192a47fc9d415f9c7b0c786d05c25f34e725f6" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Wed Aug 06 14:24:14 2014 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@android.com", "time": "Thu Aug 07 19:43:17 2014 +0000" }, "message": "Introduce system API for distinguishing the owner user\n\nSupport services that special case the owner but are instantiated\nper-user, and so need to be able to distinguish.\n\nBug 16661321\n\nChange-Id: I7ff5168c91e39821317fdf5cfaba34e90d30de95\n" }, { "commit": "ae267d20c6d2c6b848193e8ec9a29ad47545339c", "tree": "35ad3999383e1567b5c31abbfa840f1af1731464", "parents": [ "bdad288c9639936b6716e0071aba402b7039a968", "9962f335a176508c30e539565ad63518fa8ca0d1" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Thu Aug 07 16:49:01 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 09:28:12 2014 +0000" }, "message": "Merge \"Revert \"Remove String version of getBadgedLabel\"\" into lmp-dev" }, { "commit": "9962f335a176508c30e539565ad63518fa8ca0d1", "tree": "3159bf0b5cef8000450d86a4d3f8ad0990da95cf", "parents": [ "4a4f275f24f6673c435c5205522273ba3500dbcc" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Thu Aug 07 16:48:06 2014 +0000" }, "committer": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Thu Aug 07 16:48:06 2014 +0000" }, "message": "Revert \"Remove String version of getBadgedLabel\"\n\nThis reverts commit ed0096c14ae1b17845bc9bb8fbb1cdc47adfdd68.\n\nChange-Id: If026db7e804be81aaa02cfd2a4e1a0a03ee020f1\n" }, { "commit": "bdad288c9639936b6716e0071aba402b7039a968", "tree": "a1679e39ede1f47ac625f96da158d0e91e8cec63", "parents": [ "65810072d6ad7c1c2a019cf37c3156e3971f491a", "8f16c0655eb4e7321f346ed62d9068ebc9fdc35b" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Thu Aug 07 16:13:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 07 16:13:09 2014 +0000" }, "message": "am 8f16c065: am 35b08bac: am edcf7c51: Merge \"docs: Simplify and update the Signing page. Bug: 16296405\" into klp-modular-docs\n\n* commit \u00278f16c0655eb4e7321f346ed62d9068ebc9fdc35b\u0027:\n docs: Simplify and update the Signing page. Bug: 16296405\n" }, { "commit": "65810072d6ad7c1c2a019cf37c3156e3971f491a", "tree": "63cca6f36619f3fe070b9574ea405b48faa65f7d", "parents": [ "e2a8c53f3fdc5c31b58491c7212f8a294db8dbc6" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Thu Aug 07 17:03:36 2014 +0100" }, "committer": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Thu Aug 07 16:09:10 2014 +0000" }, "message": "Remove LauncherApps method left for compat.\n\nMethod was left while updating unbundled apps\nwhich have now been updated.\n\nBug: 16864685\nChange-Id: I687cb23a1b60b88eeb988f3cf2604dc24b739121\n" }, { "commit": "8f16c0655eb4e7321f346ed62d9068ebc9fdc35b", "tree": "df54caa0b44ed900bb15d06d4141fa3cbe9cf537", "parents": [ "001e30729a7e12bef238df680626042b2e99d807", "35b08bacc4e4ab937a5179b5b991f6509127f517" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Thu Aug 07 16:07:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 07 16:07:37 2014 +0000" }, "message": "am 35b08bac: am edcf7c51: Merge \"docs: Simplify and update the Signing page. Bug: 16296405\" into klp-modular-docs\n\n* commit \u002735b08bacc4e4ab937a5179b5b991f6509127f517\u0027:\n docs: Simplify and update the Signing page. Bug: 16296405\n" }, { "commit": "35b08bacc4e4ab937a5179b5b991f6509127f517", "tree": "fc1f6e2b5c06d63e09b53c85885510809f2b1fb2", "parents": [ "23daa44107c17d7e30c65389bb718a9add8e4c40", "edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Thu Aug 07 16:03:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 07 16:03:27 2014 +0000" }, "message": "am edcf7c51: Merge \"docs: Simplify and update the Signing page. Bug: 16296405\" into klp-modular-docs\n\n* commit \u0027edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d\u0027:\n docs: Simplify and update the Signing page. Bug: 16296405\n" }, { "commit": "001e30729a7e12bef238df680626042b2e99d807", "tree": "72fec453a4d73bb8895d92349190f66d879c09b7", "parents": [ "4e01c59e6c0d953c40153afc080c01d844f76aef", "23daa44107c17d7e30c65389bb718a9add8e4c40" ], "author": { "name": "Robert Ly", "email": "robertly@google.com", "time": "Thu Aug 07 15:59:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 07 15:59:36 2014 +0000" }, "message": "am 23daa441: am 8e115e64: Merge \"docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).\" into klp-modular-docs\n\n* commit \u002723daa44107c17d7e30c65389bb718a9add8e4c40\u0027:\n docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).\n" }, { "commit": "23daa44107c17d7e30c65389bb718a9add8e4c40", "tree": "c2c8723a8d98091ac2e3479ba6c4b88bb33cd90e", "parents": [ "6ebeefa04cb3c360d8028eb77e60bacf8a800cb1", "8e115e6460f5bfe5e682dda6e816b9d8c84bc525" ], "author": { "name": "Robert Ly", "email": "robertly@google.com", "time": "Thu Aug 07 15:55:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 07 15:55:10 2014 +0000" }, "message": "am 8e115e64: Merge \"docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).\" into klp-modular-docs\n\n* commit \u00278e115e6460f5bfe5e682dda6e816b9d8c84bc525\u0027:\n docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).\n" }, { "commit": "8e115e6460f5bfe5e682dda6e816b9d8c84bc525", "tree": "25cd8047cfc2414166ef332853136c645702d6c7", "parents": [ "ea12f0fd7ed236fa38f73cfff5be5fa36f016690", "897cf908c9f1e5f5a2c0b4a3ec72636e64b94eb4" ], "author": { "name": "Robert Ly", "email": "robertly@google.com", "time": "Thu Aug 07 15:50:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 15:00:45 2014 +0000" }, "message": "Merge \"docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).\" into klp-modular-docs" }, { "commit": "4a4f275f24f6673c435c5205522273ba3500dbcc", "tree": "23e74879f001538760b78ded2a9e17cb40b09768", "parents": [ "2e7cf64842aadcf198ee97d137ccbb02ee2115fd" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Thu Aug 07 12:23:49 2014 +0100" }, "committer": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Thu Aug 07 11:28:48 2014 +0000" }, "message": "Remove String version of getBadgedLabel\n\nIt was left to allow unbundled apps time to update.\n\nBug: 16484455\nChange-Id: Ibae2576ac7fc88000ec81c669e66536aaa2e3e79\n" }, { "commit": "e2a8c53f3fdc5c31b58491c7212f8a294db8dbc6", "tree": "2e8ea28ff2cba394759bc62be6c0fbcd2e250d2e", "parents": [ "83c7a53b4f043a5528d52ca9851829ff07193bc7", "e9a4e90db6e7493e84084197361da7140817265b" ], "author": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Thu Aug 07 16:08:38 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 09:28:12 2014 +0000" }, "message": "Merge \"Link to new app notification settings from the inspector.\" into lmp-dev" }, { "commit": "e9a4e90db6e7493e84084197361da7140817265b", "tree": "a7e4e39a655636e51fb7a6848573c0f999efbe48", "parents": [ "5f2220df7f40154be5d4585c304cd2f0770068ff" ], "author": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Thu Jul 31 01:06:43 2014 -0400" }, "committer": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Thu Aug 07 12:04:36 2014 -0400" }, "message": "Link to new app notification settings from the inspector.\n\nAlso hide the inspector whenever the keyguard changes state,\nto make sure we don\u0027t leave any notification guts lying\naround when you turn the screen on and off or unlock.\n\nBug: 16208321\nChange-Id: I47cf6a0cb82e765eb6b50984972f57616b534ed3\n" }, { "commit": "edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d", "tree": "b9e5b9c61dc7caf0b33bb32c3d7495f6f0faca7b", "parents": [ "8e115e6460f5bfe5e682dda6e816b9d8c84bc525", "7383f1708e9c3a15e63a64c316cbb34f4f863d24" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Thu Aug 07 16:00:13 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 06 23:54:36 2014 +0000" }, "message": "Merge \"docs: Simplify and update the Signing page. Bug: 16296405\" into klp-modular-docs" }, { "commit": "4e01c59e6c0d953c40153afc080c01d844f76aef", "tree": "5dc25242eb0de9cf872521f97279299c342fd1d7", "parents": [ "c08203c22c8407d9a9777eb6f436bfb79edb1f74", "6ebeefa04cb3c360d8028eb77e60bacf8a800cb1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:59:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:59:08 2014 +0000" }, "message": "am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u00276ebeefa04cb3c360d8028eb77e60bacf8a800cb1\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "6ebeefa04cb3c360d8028eb77e60bacf8a800cb1", "tree": "47ddc05482de9b916c1d840f466f4c471567043a", "parents": [ "4881578e6ccd8b51606750e3fd4e20b2204287c7", "904d77118bab63139174470ef728ca9a53e75a15" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:51:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:51:47 2014 +0000" }, "message": "am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u0027904d77118bab63139174470ef728ca9a53e75a15\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "904d77118bab63139174470ef728ca9a53e75a15", "tree": "dd30bcfe24066fa46bade5643bac51baba337c2b", "parents": [ "f365928406ef0a80d3aecc2d025642f9efb80a05", "7b561be3a6fedebfce412cecd8c36d6686f6576c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:45:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:45:23 2014 +0000" }, "message": "am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u00277b561be3a6fedebfce412cecd8c36d6686f6576c\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "7b561be3a6fedebfce412cecd8c36d6686f6576c", "tree": "c030bef5bff5e0fed885dadffbaa04c4bb0a94fa", "parents": [ "b86675f14bea0c833f0ac3f0ec4d3e5f46784569", "09c3c2edb2391d3ffed9a07ec360b9f75b9f7637" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:37:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:37:10 2014 +0000" }, "message": "am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u002709c3c2edb2391d3ffed9a07ec360b9f75b9f7637\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "09c3c2edb2391d3ffed9a07ec360b9f75b9f7637", "tree": "34b6eab1f556204667aa53d6d91950faf9a5917b", "parents": [ "f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1", "ba31d628621f3d49195d141dabff30a7665f3b50" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:30:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:30:06 2014 +0000" }, "message": "am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u0027ba31d628621f3d49195d141dabff30a7665f3b50\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "ba31d628621f3d49195d141dabff30a7665f3b50", "tree": "7de17ce9e156838e033f6bc11e02d1fbe5f515bf", "parents": [ "b9efa1e5a11d1542d0bab9c945ce1e920b819764", "db94ea9ed03dbaa0ca075a433a986d7e414e8f8d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:25:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:25:50 2014 +0000" }, "message": "am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u0027db94ea9ed03dbaa0ca075a433a986d7e414e8f8d\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "db94ea9ed03dbaa0ca075a433a986d7e414e8f8d", "tree": "a77ce10b5515d365a802ecbed6c5a0f0ca880277", "parents": [ "14a4e69cc656b60c705d2f05229aed2a7049693c", "f970d2c201649843b8d51d094b865f16b15bc0bc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:21:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:21:54 2014 +0000" }, "message": "am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u0027f970d2c201649843b8d51d094b865f16b15bc0bc\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "f970d2c201649843b8d51d094b865f16b15bc0bc", "tree": "75615ab15cbbba19cfe1e23ec5554cf9c3b0e08f", "parents": [ "c735197420948ffff757dbe6d00028a87ed09c15", "79c3f678d21f6b3c058623217cbe5dd57a553fe8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:18:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:18:04 2014 +0000" }, "message": "am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u002779c3f678d21f6b3c058623217cbe5dd57a553fe8\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "79c3f678d21f6b3c058623217cbe5dd57a553fe8", "tree": "3bd1274b7b553dc6fb2f224854c3e29fdc5fd36f", "parents": [ "a3966c66ee24109ca4b71f591f0d740ee37987de", "206c691bfdb3a6b78d35c7481365980dd387b8c9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:13:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:13:18 2014 +0000" }, "message": "am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u0027206c691bfdb3a6b78d35c7481365980dd387b8c9\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "206c691bfdb3a6b78d35c7481365980dd387b8c9", "tree": "c96095716da0bb4930d00a217eea73ae17015bef", "parents": [ "627439401ec86a083eefdc61728d6aa75ce9a4e5", "72cf03a27a73e91d4a3eabf74e0384b310f4a5b2" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:09:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:09:13 2014 +0000" }, "message": "am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u002772cf03a27a73e91d4a3eabf74e0384b310f4a5b2\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "72cf03a27a73e91d4a3eabf74e0384b310f4a5b2", "tree": "daedb43ca33e5c9cf2aebc4cf0fff80019530247", "parents": [ "8c71ff298b10ebdd3e5dec6f69f70176161b7e0a", "3a544a81b3d2d529b2995f4b5db2077760d440b5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:05:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:05:38 2014 +0000" }, "message": "am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u00273a544a81b3d2d529b2995f4b5db2077760d440b5\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "3a544a81b3d2d529b2995f4b5db2077760d440b5", "tree": "daa0050d5d06ebaef98aafc265738a731b6a54fb", "parents": [ "87234e8544370d86b305fc55d6a5021c38b65495", "a232a68d4ccf2960350adff6af99a52bde2b021d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 15:00:14 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 15:00:14 2014 -0700" }, "message": "resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\nChange-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c\n" }, { "commit": "a232a68d4ccf2960350adff6af99a52bde2b021d", "tree": "0426f2e5c60e22976a032f1a7c9ae47c202dc76e", "parents": [ "9c48ab82084828087c47086f2379b4927ec057e2", "5476cfee6b8b5e17a7fa72bb141ca95ef913a4f5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 14:41:02 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 14:41:02 2014 -0700" }, "message": "resolved conflicts for merge of 5476cfee to jb-mr1-dev\n\nChange-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4\n" }, { "commit": "733341bf0db89c93ee1341ddfca9b0c49731c836", "tree": "c8378584e47bd0bf0d8e176f4564b38f296e4c86", "parents": [ "d2a9363208efc721b2ebb8f98a55b4ee08af4a76" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Jul 29 18:38:04 2014 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Aug 06 14:35:40 2014 -0700" }, "message": "camera2: (legacy) Support awb mode, test mode metadata keys\n\nChange-Id: Ic013aa820bbea02a662d546eb9f70baa20c0136e\n" }, { "commit": "5476cfee6b8b5e17a7fa72bb141ca95ef913a4f5", "tree": "894b431b98faac08fc3df1dbfa1fd991f999b188", "parents": [ "ccf7b2aac600b6069f03f7f420872b64cc5e6726", "505c675c3a536ac7c6ad264eb62542537532119c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 21:28:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 21:28:24 2014 +0000" }, "message": "am 505c675c: Fix SystemProperties in LayoutLib.\n\n* commit \u0027505c675c3a536ac7c6ad264eb62542537532119c\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "aa21e395f536738f1f7dee01d752d69f2dff632e", "tree": "df189866a58a2bfa592518236ce7a081d4c92434", "parents": [ "1cda67f8b38e34f495e61b903f518f5a695242b5" ], "author": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Wed Aug 06 19:26:11 2014 +0000" }, "committer": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Wed Aug 06 19:26:11 2014 +0000" }, "message": "Need to post-process all action icons to get the correct color.\n\nThis reverts commit fd266000212b33956d586807c76967b30b815cb6.\n\nBug: 16846210\nChange-Id: I67e0acaacb6a4d9eb9a1a7392a7c647ff51c8f54\n" }, { "commit": "505c675c3a536ac7c6ad264eb62542537532119c", "tree": "8d6bd1171d9ef49510a963ee4a1ff6756bd76a17", "parents": [ "5af7324ace4f318d7395b680beabec7a0f0e39b3" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Aug 05 17:33:35 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Aug 05 17:47:30 2014 -0700" }, "message": "Fix SystemProperties in LayoutLib.\n\nNot all System Properties were used via Build class. Also, properties\nlike SDK_INT which called SystemProperties directly were not initialized\nproperly.\n\nThis change is essentially cherry picking of the relevant parts from the\nfollowing commits:\n984749bf75c9ce9d3401b8410ea7d6276544b6ee\n167bc25bceea9280bbe4858db4cb8233f86ce325\n\nBug: http://b.android.com/73046\nChange-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df\n" }, { "commit": "2e7cf64842aadcf198ee97d137ccbb02ee2115fd", "tree": "3159bf0b5cef8000450d86a4d3f8ad0990da95cf", "parents": [ "956afc2ba79f50bb8025c6d334653e3c3419b480", "cead2839a5ed586e18299b84c4c93f095b8498b7" ], "author": { "name": "Robin Lee", "email": "rgl@google.com", "time": "Thu Aug 07 10:35:42 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 05 00:35:13 2014 +0000" }, "message": "Merge \"Permit crash report button for user profiles\" into lmp-dev" }, { "commit": "cead2839a5ed586e18299b84c4c93f095b8498b7", "tree": "0816afcc2239aa79d839a17d3c0f8dfa7f4b718c", "parents": [ "00f201e41b5b496327b9578e6fb00fad8b4d9da9" ], "author": { "name": "Robin Lee", "email": "rgl@google.com", "time": "Tue Aug 05 16:15:12 2014 +0100" }, "committer": { "name": "Robin Lee", "email": "rgl@google.com", "time": "Thu Aug 07 10:11:02 2014 +0000" }, "message": "Permit crash report button for user profiles\n\nLoosens the restriction for reporting an issue with an app from \"same\nprofile\" to \"same user\".\n\nFixes bug 16792315.\n\nChange-Id: I25100a3f7030b2a74e9fe40894103677e8db6cdd" }, { "commit": "956afc2ba79f50bb8025c6d334653e3c3419b480", "tree": "91ad14a72d20700bb62a1da181eda819c43eca10", "parents": [ "00f201e41b5b496327b9578e6fb00fad8b4d9da9" ], "author": { "name": "Ji-Hwan Lee", "email": "jihwan@google.com", "time": "Sat Jul 26 11:31:39 2014 +0900" }, "committer": { "name": "Ji-Hwan Lee", "email": "jihwan@google.com", "time": "Thu Aug 07 10:05:30 2014 +0000" }, "message": "TIF: Handle setMainSession for TV input wrapper services\n\nBug: 15994065\nChange-Id: I46b3c0a89be92036f2c3849a412075caf587ec5c\n" }, { "commit": "00f201e41b5b496327b9578e6fb00fad8b4d9da9", "tree": "0c09aedf9068ddb428430cd16108759ef25db26c", "parents": [ "faa4b3cb06f3b10ece1f1d246a3530fc2f30a6da", "fe0f24cc92b04e03cac3f807859721f1ce7ef54a" ], "author": { "name": "Esteban Talavera", "email": "etalavera@google.com", "time": "Thu Aug 07 09:59:46 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 05 00:35:13 2014 +0000" }, "message": "Merge \"Wipe only managed profile when max number of incorrect passwords exceeded\" into lmp-dev" }, { "commit": "faa4b3cb06f3b10ece1f1d246a3530fc2f30a6da", "tree": "dceaab6ce25f8c4258a20bd018474d29aa32c3e4", "parents": [ "7dea98f6f929cce598d669a802b13851987e2e64" ], "author": { "name": "Robin Lee", "email": "rgl@google.com", "time": "Wed Aug 06 20:33:09 2014 +0100" }, "committer": { "name": "Robin Lee", "email": "rgl@google.com", "time": "Thu Aug 07 10:15:45 2014 +0100" }, "message": "Disallow switching managed profile to foreground\n\nAnother check in the ActivityManager to stop us from getting into an\ninvalid state by a fat-fingered \u0027am switch\u0027 etc.\n\n@bug 16814252\n\nChange-Id: Id65ab647d5a535cc2f965139a1b717cf65aa7e69\n" }, { "commit": "7dea98f6f929cce598d669a802b13851987e2e64", "tree": "157239aba58062888b21cdfae2080962b78f369f", "parents": [ "2849b7ccd1cf973f862dd9b95355afbc9ca9268b" ], "author": { "name": "Yuncheol Heo", "email": "ycheo@google.com", "time": "Thu Aug 07 17:58:59 2014 +0900" }, "committer": { "name": "Yuncheol Heo", "email": "ycheo@google.com", "time": "Thu Aug 07 17:58:59 2014 +0900" }, "message": "Allow to use device\u0027s own physical address.\n\n- Fixed JavaDoc.\n\nChange-Id: I6fdbf6596b5f2e41a238b36e128ba0889725c813\n" }, { "commit": "2849b7ccd1cf973f862dd9b95355afbc9ca9268b", "tree": "71557fbd3f2f1f117a81f5ac535e3faf51875605", "parents": [ "df9f0a321e0cb2958c9d170395a0367a106fa0e6" ], "author": { "name": "Yuncheol Heo", "email": "ycheo@google.com", "time": "Thu Aug 07 11:45:39 2014 +0900" }, "committer": { "name": "Yuncheol Heo", "email": "ycheo@google.com", "time": "Thu Aug 07 17:30:08 2014 +0900" }, "message": "Go to nap when receiving \u003cActive Source\u003e for the other devices.\n\n- Previously, it went to sleep when it got \u003cActive Source\u003e, but this\n causes the other side-effects like can\u0027t-wake-up when changing to HDMI\n port directly.\n\nBug: 15578870\nChange-Id: I0ca5bd2372c9e5e7446592d66483900eeba75500\n" }, { "commit": "df9f0a321e0cb2958c9d170395a0367a106fa0e6", "tree": "165f291783cb9b0a613ba1d1913de6d4910781ef", "parents": [ "ce5bbbea08e9dca963a208f5199aad699d4a854d" ], "author": { "name": "Terry Heo", "email": "terryheo@google.com", "time": "Wed Aug 06 13:53:33 2014 +0900" }, "committer": { "name": "Terry (Woncheol) Heo", "email": "terryheo@google.com", "time": "Thu Aug 07 08:07:17 2014 +0000" }, "message": "TIF: Add system API \u0027isSingleSessionActive()\u0027\n\nBug: 16498558\nChange-Id: I4f815f431051dbf786216d2b04e9737be451a508\n" }, { "commit": "ce5bbbea08e9dca963a208f5199aad699d4a854d", "tree": "365545c15a67ffd90498fa50a4f33871c1f1a264", "parents": [ "0d8fb019633300a6636f1bf99f0716e8579dab35" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jul 30 15:13:17 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Aug 06 22:25:01 2014 -0700" }, "message": "Move image classes options from art to AndroidRuntime [frameworks/base]\n\nBug: 15165413\n\n(cherry picked from commit 108166c749f0418d45f220419a9611c4afec1311)\n\nChange-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa\n" }, { "commit": "0d8fb019633300a6636f1bf99f0716e8579dab35", "tree": "6a5302c69e3dd5d07bb383bcb274bae009488f39", "parents": [ "3fbfbb4adeec1dda1e149758ea302c386101f267" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jul 30 12:11:41 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Aug 06 22:25:01 2014 -0700" }, "message": "Disable compilation based on vold.decrypt. [frameworks/base]\n\nBug: 15165413\n\n(cherry picked from commit 4fd561637a173c7fa6a1d71e9115db1db90514ff)\n\nChange-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed\n" }, { "commit": "3fbfbb4adeec1dda1e149758ea302c386101f267", "tree": "e24c0a50c90acfeabf8c79e19c1635910ffe8078", "parents": [ "a25dc2bbe70b7449dc57e9619778ba592c198003" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Mon Jul 28 19:13:28 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Aug 06 22:25:00 2014 -0700" }, "message": "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]\n\nThis will allow us to conditionally change the compiler-filter based on other properties.\n\nBug: 15165413\n\n(cherry picked from commit f60d3a4702f6d00d7edb5d348c53b9b03ae16b76)\n\nChange-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed\n" }, { "commit": "a25dc2bbe70b7449dc57e9619778ba592c198003", "tree": "f497fe5905be0a10103c77590068e888db0af688", "parents": [ "7bbf9e720d12c06c46c468f18848b37d61bcaf28" ], "author": { "name": "Alex Light", "email": "allight@google.com", "time": "Tue Aug 05 14:25:43 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Aug 06 22:25:00 2014 -0700" }, "message": "resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp\n\nChange-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d\n(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)\n" }, { "commit": "fe0f24cc92b04e03cac3f807859721f1ce7ef54a", "tree": "1ef3bbf51014c4775a686bb2808978d60549ba0e", "parents": [ "3f1ddf83a4faba3dec71ed7eebe1835f4685cf60" ], "author": { "name": "Esteban Talavera", "email": "etalavera@google.com", "time": "Wed Aug 06 16:20:56 2014 +0100" }, "committer": { "name": "Esteban Talavera", "email": "etalavera@google.com", "time": "Wed Aug 06 18:10:16 2014 +0100" }, "message": "Wipe only managed profile when max number of incorrect passwords exceeded\n\nWhen the maximum number of retries that has been exceeded is not for the primary profile of the user, wipe only the profile that set that policy (e.g. the managed profile) rather than the entire user. At the moment the whole device is wiped if the max number of incorrect passwords for a managed profile is reached, as the password is shared with the USER_OWNER.\n\nBug: 14453697\nChange-Id: I5746de104133c0ea0a51d75b9c92e1516d365d8c\n" }, { "commit": "5f2220df7f40154be5d4585c304cd2f0770068ff", "tree": "7b42f63179eee667910a024ecd67ed05862ada75", "parents": [ "a909b28a132b25fcfccd30baedc084e0a2353108", "b8b4774e6185058b179a31f8c1a2dd806413e31b" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 14:06:46 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 05 00:19:02 2014 +0000" }, "message": "Merge \"Fix NPE in DevicePolicyManagerService that crashed SystemUI\" into lmp-dev" }, { "commit": "b8b4774e6185058b179a31f8c1a2dd806413e31b", "tree": "feee3ddf905ce2c40e81b25dea8cc23a70a1c415", "parents": [ "3c9a3501651aa8ad4f289e89119a6c0b4bdaf78a" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 15:55:18 2014 +0200" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 15:55:21 2014 +0200" }, "message": "Fix NPE in DevicePolicyManagerService that crashed SystemUI\n\nBug: 16857795\nChange-Id: I6234f03c4ee31311af9f9c556b790594ee1a8b2f\n" }, { "commit": "3c9a3501651aa8ad4f289e89119a6c0b4bdaf78a", "tree": "5b2d0376c86124273a5e4a5df75f805723bcf761", "parents": [ "04e5f72cdb7bbe494e4b330b393388d1e0b18f74" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Aug 06 19:09:45 2014 +0200" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 15:13:09 2014 +0200" }, "message": "Pass initiatedByUser to TrustListeners\n\nBug: 16840500\nChange-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1\n" }, { "commit": "a909b28a132b25fcfccd30baedc084e0a2353108", "tree": "9e85be0049e413ada6ff8fd1926e8d4c6d7da9ec", "parents": [ "0da70938403650c5517b3da14b6c3fe0ef293e4a", "deb0d11a43f0503d8556b44031f4ab6e75b39bd8" ], "author": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Thu Aug 07 14:05:41 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 12:44:12 2014 +0000" }, "message": "Merge \"Fix screenshots.\" into lmp-dev" }, { "commit": "deb0d11a43f0503d8556b44031f4ab6e75b39bd8", "tree": "e5dc3e85cae6d96e200610bf366c2c274482e179", "parents": [ "04e5f72cdb7bbe494e4b330b393388d1e0b18f74" ], "author": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Thu Aug 07 09:21:06 2014 -0400" }, "committer": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Thu Aug 07 09:24:03 2014 -0400" }, "message": "Fix screenshots.\n\nBug: 16861182\nChange-Id: I9433cb4a5cc100d85f06eeed18ade3ead5ba8188\n" }, { "commit": "0da70938403650c5517b3da14b6c3fe0ef293e4a", "tree": "5b2d0376c86124273a5e4a5df75f805723bcf761", "parents": [ "138b324d5db09cff27e43c8ee3614def01630013", "3c9a3501651aa8ad4f289e89119a6c0b4bdaf78a" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 13:57:55 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 12:44:12 2014 +0000" }, "message": "Merge \"Pass initiatedByUser to TrustListeners\" into lmp-dev" }, { "commit": "138b324d5db09cff27e43c8ee3614def01630013", "tree": "fae8148a4dd4018a72498c3e712ec904d9a04c03", "parents": [ "0f5efe0b440832f6dea37b4381f9e4ebafd9bcad", "678e3ecc937c00969830700dffb42fb1ee232f7c" ], "author": { "name": "Zoltan Szatmary-Ban", "email": "szatmz@google.com", "time": "Thu Aug 07 13:42:27 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 12:44:12 2014 +0000" }, "message": "Merge \"Revert \"Update Trusted Credentials screen in settings\"\" into lmp-dev" }, { "commit": "678e3ecc937c00969830700dffb42fb1ee232f7c", "tree": "98c7144f8cca3b46411549aad4bbdcaa5376df00", "parents": [ "1386627335a79dd02fb34db344e63ca3abfce013" ], "author": { "name": "Zoltan Szatmary-Ban", "email": "szatmz@google.com", "time": "Thu Aug 07 13:41:08 2014 +0000" }, "committer": { "name": "Zoltan Szatmary-Ban", "email": "szatmz@google.com", "time": "Thu Aug 07 13:41:08 2014 +0000" }, "message": "Revert \"Update Trusted Credentials screen in settings\"\n\nThis reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.\n\nChange-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763\n" }, { "commit": "04e5f72cdb7bbe494e4b330b393388d1e0b18f74", "tree": "fae8148a4dd4018a72498c3e712ec904d9a04c03", "parents": [ "2e7cf64842aadcf198ee97d137ccbb02ee2115fd", "ccdff62159b41ab130a8f90d30edb9b9542d8c72" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Aug 07 12:47:22 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 07 09:28:12 2014 +0000" }, "message": "Merge \"Update User switcher to new spec, implement adding users\" into lmp-dev" }, { "commit": "ccdff62159b41ab130a8f90d30edb9b9542d8c72", "tree": "4a5d65ec48c3364c6ad9260323a6529af4a4088c", "parents": [ "7c7bc7f6917484250974c5da00af9ef756844b0a" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Aug 06 00:07:18 2014 +0200" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Aug 06 18:00:32 2014 +0200" }, "message": "Update User switcher to new spec, implement adding users\n\nAlso enforces restrictions on when guests can be added.\n\nBug: 15545213\nChange-Id: Ia03747fbcc39f2b1b20876463c85afbac5057878\n" }, { "commit": "7c7bc7f6917484250974c5da00af9ef756844b0a", "tree": "86799cdb91972735a4bf94c92993790176459d71", "parents": [ "022e7cc2985046af45e4b0a2fce78870f6e6dfac" ], "author": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Mon Jul 28 18:15:48 2014 -0700" }, "committer": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Wed Aug 06 03:36:09 2014 -0700" }, "message": "Add setConferenceable() API from ConnectionService to incall. (1/4)\n\nChange-Id: I64fdca08d35f893d755e3b154543a261b1418343\n" }, { "commit": "72af07503404018be289fa940de37c46984c090c", "tree": "84baca1e53c7f40e2f0aa79269d0ee7b65b5a1b8", "parents": [ "256e1a62673472d685232d88ad4d067eb82deeac", "5f5163548424ed3a4d7ea259848f82fb74aaf75d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 07 17:55:24 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 05 00:19:02 2014 +0000" }, "message": "Merge \"Add setting to disable automatic USB audio routing\" into lmp-dev" }, { "commit": "5f5163548424ed3a4d7ea259848f82fb74aaf75d", "tree": "4f6ec9783bd9d255343c957f6c6d27721d8c2ece", "parents": [ "9413b245a6e5264ce4e57c48a90ee96f914476e2" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Jul 22 09:11:48 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 07 10:31:53 2014 -0700" }, "message": "Add setting to disable automatic USB audio routing\n\nBug: 16381952\nChange-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43\n" } ], "next": "83c7a53b4f043a5528d52ca9851829ff07193bc7" }