)]}' { "log": [ { "commit": "55dab4dd3b5b56ade91c012d688b581b6cbdebdf", "tree": "889b51bf659ebd5a0c68223bda707b07378dec49", "parents": [ "337e764debde56b1462fb5f2794b3e917d8a42e2", "b11f250e09195d1ab250c93bfed0b31ed3a40f3d" ], "author": { "name": "Jinsuk Kim", "email": "jinsukkim@google.com", "time": "Fri Apr 11 09:40:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 09:40:46 2014 +0000" }, "message": "am b11f250e: Merge \"Delegate HdmiCecService method impl to HdmiCecDevice subclass\" into klp-modular-dev\n\n* commit \u0027b11f250e09195d1ab250c93bfed0b31ed3a40f3d\u0027:\n Delegate HdmiCecService method impl to HdmiCecDevice subclass\n" }, { "commit": "b11f250e09195d1ab250c93bfed0b31ed3a40f3d", "tree": "812adca5d51a8f4b12bea3ab0325f2b53af5e99f", "parents": [ "f24687e2731811fd0e3803b691fd47a659f89329", "61791075f4422cfef00fda325d6ae07293dd262f" ], "author": { "name": "Jinsuk Kim", "email": "jinsukkim@google.com", "time": "Fri Apr 11 09:38:22 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 11 09:38:23 2014 +0000" }, "message": "Merge \"Delegate HdmiCecService method impl to HdmiCecDevice subclass\" into klp-modular-dev" }, { "commit": "61791075f4422cfef00fda325d6ae07293dd262f", "tree": "2a2b3441329d2d4863c2bac97f5d24f9e562582d", "parents": [ "bd6c5577ab0790415b99d24f41b7b3cdd823449d" ], "author": { "name": "Jinsuk Kim", "email": "jinsukkim@google.com", "time": "Mon Apr 07 13:39:17 2014 +0900" }, "committer": { "name": "Jinsuk Kim", "email": "jinsukkim@google.com", "time": "Fri Apr 11 18:35:01 2014 +0900" }, "message": "Delegate HdmiCecService method impl to HdmiCecDevice subclass\n\nMost of the methods in the interface IHdmiCecService should be implemented\nbased on the device type. This CL makes a change such that the HdmiCecDevice\njust has stub methods that should be overriden by subclasses.\n\nOther changes:\n - Fixed a bug of \u003cInactive Source\u003e not sending its physical address\n in its message body. Also the command should have been sent to TV\n only rather than broadcast.\n\n - Put back sendGiveDevicePowerStatus interface method. It allows the client\n to keep track of the other device(like TV) power status more closely.\n Devices goes through the status from standby -\u003e transient to on -\u003e on\n but the CEC spec doesn\u0027t require that they broacast it actively.\n\n The restored method can be used to let the playback device to get\n up-to-date power status of TV/display when it is booting up.\n\n This method should work the same across all the device types. So it was\n implemented in the service, not delegated to HdmiCecDevice.\n\n - Send \u003cReport Physical Address\u003e when a new logical device is registered,\n which is required by CEC spec: \"it should report the association between\n its logical and physical address by broadcasting \u003cReport Physical\n Address\u003e\n\nChange-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63\n" }, { "commit": "337e764debde56b1462fb5f2794b3e917d8a42e2", "tree": "5a2b4e77654a0897408f04e429045e49359a0e4b", "parents": [ "cd5e3f85fc9228b943ee8dfda0951e068953596c", "f24687e2731811fd0e3803b691fd47a659f89329" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Apr 11 03:49:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 03:49:37 2014 +0000" }, "message": "am f24687e2: Merge \"Plumb display power state through display manager.\" into klp-modular-dev\n\n* commit \u0027f24687e2731811fd0e3803b691fd47a659f89329\u0027:\n Plumb display power state through display manager.\n" }, { "commit": "f24687e2731811fd0e3803b691fd47a659f89329", "tree": "f967fbbe51e2a1de4621d29a90e556f8b9d95a4d", "parents": [ "da6b9599c77230c689d63e32ca80b62f60f18c27", "037c33eae74bee2774897d969d48947f9abe254f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Apr 11 03:47:08 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 11 03:47:08 2014 +0000" }, "message": "Merge \"Plumb display power state through display manager.\" into klp-modular-dev" }, { "commit": "037c33eae74bee2774897d969d48947f9abe254f", "tree": "9f6a33f07f48b9a08088eb287c1bfdd1fd97bda5", "parents": [ "7289f3ab8f05db6206d696d75f460fadc05dc731" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Apr 09 00:31:55 2014 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Apr 10 20:46:14 2014 -0700" }, "message": "Plumb display power state through display manager.\n\nDeclare a new method, Display.getState() to retrieve the actual\npower state of a display.\n\nImproved documentation for Intent.ACTION_SCREEN_ON and\nIntent.ACTION_SCREEN_OFF to clarify what they really mean in\nterms of the interactive state of the device.\n\nDeprecated PowerManager.isScreenOn() and replaced it with\nPowerManager.isInteractive() with a more suggestive name and\nbetter documentation.\n\nRedirect display power state changes to go through the display\nmanager first and only then head over to the power manager for\nlegacy compatibility.\n\nEliminated the bright here and woke here policy flags since they\nwere unused. Simplified the input dispatch policy somewhat.\n\nEnsure that screen wake locks are respected up until the point\nwhen dozing really begins.\n\nFixed a regression in DreamService where onDreamingStarted\nmight be called before onWindowAttached.\n\nBug: 13133142\nBug: 13472578\nBug: 13929355\nBug: 13760290\nChange-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0\n" }, { "commit": "cd5e3f85fc9228b943ee8dfda0951e068953596c", "tree": "3c820886f39d85b51c4973e9f3e5bd6e3fe60d53", "parents": [ "3603970d3a8a2215027e96c4861e1ab9eec86f79", "da6b9599c77230c689d63e32ca80b62f60f18c27" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Thu Apr 10 15:55:25 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 10 15:55:25 2014 +0000" }, "message": "am da6b9599: (-s ours) Merge \"Import translations. DO NOT MERGE\" into klp-modular-dev\n\n* commit \u0027da6b9599c77230c689d63e32ca80b62f60f18c27\u0027:\n Import translations. DO NOT MERGE\n" }, { "commit": "da6b9599c77230c689d63e32ca80b62f60f18c27", "tree": "4fbb13e9374a7a151362ec25b6fceff6137507ad", "parents": [ "2e8a2d207f446e156a8cfb9532cdfb569caa9458", "f7d65ae85268d0cb164cca865ebad3f94656295c" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Thu Apr 10 15:51:37 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Apr 10 15:51:37 2014 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into klp-modular-dev" }, { "commit": "3603970d3a8a2215027e96c4861e1ab9eec86f79", "tree": "3c820886f39d85b51c4973e9f3e5bd6e3fe60d53", "parents": [ "9e289d70a8baaed0030413b5991653792e2a816d", "940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 11:25:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 10 11:25:56 2014 +0000" }, "message": "am 940e76fd: am b827f78e: Merge \"Removed android.debug.JNITest from preloaded-classes\"\n\n* commit \u0027940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba\u0027:\n Removed android.debug.JNITest from preloaded-classes\n" }, { "commit": "940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba", "tree": "f1f721a5f53d16dd3b2fd7b978be650f85b3bbd2", "parents": [ "1d26a3f1efd0d965e8751e8515608c31789bdbe2", "b827f78e7acee3a604c315615268edf7098dc184" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 11:21:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 10 11:21:33 2014 +0000" }, "message": "am b827f78e: Merge \"Removed android.debug.JNITest from preloaded-classes\"\n\n* commit \u0027b827f78e7acee3a604c315615268edf7098dc184\u0027:\n Removed android.debug.JNITest from preloaded-classes\n" }, { "commit": "b827f78e7acee3a604c315615268edf7098dc184", "tree": "79f73ab5b8fada04b00007ad2ba8f5c088f5f29f", "parents": [ "09e13cc5f9f98382376eb49bfa6ceb94a50d37a1", "1b20424cf09de4a061eda64ea4e6ea85dcba9492" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 11:18:28 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 10 11:18:28 2014 +0000" }, "message": "Merge \"Removed android.debug.JNITest from preloaded-classes\"" }, { "commit": "9e289d70a8baaed0030413b5991653792e2a816d", "tree": "e16db27d381be1519ce8a4fc645d95dfe3bf1d79", "parents": [ "286a247e4c8fcecb59636f668678d24e33142744", "1d26a3f1efd0d965e8751e8515608c31789bdbe2" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 09:26:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 10 09:26:59 2014 +0000" }, "message": "am 1d26a3f1: am 09e13cc5: Merge \"System services detect and register app CPU ABIs\"\n\n* commit \u00271d26a3f1efd0d965e8751e8515608c31789bdbe2\u0027:\n System services detect and register app CPU ABIs\n" }, { "commit": "286a247e4c8fcecb59636f668678d24e33142744", "tree": "4c2ce4981a5e2e2bcc4badd1b537781c6ecc7f37", "parents": [ "544991946287bdd3a9e6a71855642e378594bf73", "0fd40cb100bccbd5d9ad6109ca39c818a857f889" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 09:26:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 10 09:26:44 2014 +0000" }, "message": "am 0fd40cb1: am 80413c9f: Merge \"Re-implement native library search and copies.\"\n\n* commit \u00270fd40cb100bccbd5d9ad6109ca39c818a857f889\u0027:\n Re-implement native library search and copies.\n" }, { "commit": "1d26a3f1efd0d965e8751e8515608c31789bdbe2", "tree": "b2ee69a7621a123b5ebf8f9b91a3ac37ef0dd2a4", "parents": [ "0fd40cb100bccbd5d9ad6109ca39c818a857f889", "09e13cc5f9f98382376eb49bfa6ceb94a50d37a1" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 09:23:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 10 09:23:33 2014 +0000" }, "message": "am 09e13cc5: Merge \"System services detect and register app CPU ABIs\"\n\n* commit \u002709e13cc5f9f98382376eb49bfa6ceb94a50d37a1\u0027:\n System services detect and register app CPU ABIs\n" }, { "commit": "0fd40cb100bccbd5d9ad6109ca39c818a857f889", "tree": "68d06a03d0a86f754a7ec121ef6790da669431e9", "parents": [ "7a67c927e622bb176b21455b8ed56c76b8e0f602", "80413c9fe10acf36eaecd139198c7fc17e8af2e6" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 09:23:30 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 10 09:23:30 2014 +0000" }, "message": "am 80413c9f: Merge \"Re-implement native library search and copies.\"\n\n* commit \u002780413c9fe10acf36eaecd139198c7fc17e8af2e6\u0027:\n Re-implement native library search and copies.\n" }, { "commit": "09e13cc5f9f98382376eb49bfa6ceb94a50d37a1", "tree": "892d3deb7188f2840dbd04f6039a8edd55aa236e", "parents": [ "80413c9fe10acf36eaecd139198c7fc17e8af2e6", "ff0c470833b2cb4130a30895093630242d5f238d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 09:20:21 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 10 09:20:22 2014 +0000" }, "message": "Merge \"System services detect and register app CPU ABIs\"" }, { "commit": "80413c9fe10acf36eaecd139198c7fc17e8af2e6", "tree": "80e8885a3d8493614f8f6aa025b2b34260216f5f", "parents": [ "ecdf9b199ac9659c37c34c0b23084199acea80bf", "1378aba7aeeb7f6dd6cc2503968ba7b0e58d9333" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 10 09:19:38 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 10 09:19:38 2014 +0000" }, "message": "Merge \"Re-implement native library search and copies.\"" }, { "commit": "544991946287bdd3a9e6a71855642e378594bf73", "tree": "44b75caaa9a1e2f40271d1c400058ff430f33715", "parents": [ "3c1c137579783fad81169da01d5c7c5819c81b07", "2e8a2d207f446e156a8cfb9532cdfb569caa9458" ], "author": { "name": "Zhihai Xu", "email": "zhihaixu@google.com", "time": "Wed Apr 09 23:50:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 23:50:39 2014 +0000" }, "message": "am 2e8a2d20: Merge \"LE: Return false if an attribute read/write is in progress\" into klp-modular-dev\n\n* commit \u00272e8a2d207f446e156a8cfb9532cdfb569caa9458\u0027:\n LE: Return false if an attribute read/write is in progress\n" }, { "commit": "3c1c137579783fad81169da01d5c7c5819c81b07", "tree": "ee0deb7f1f9bd87e35cf6a8a7bb1d638de1c145e", "parents": [ "6fdb5e6df178b3b1062ac67b505b288aa609a66b", "8d31358fb4f0f948fcfd07399d4247375dc5eea9" ], "author": { "name": "Jesse Gunsch", "email": "gunsch@google.com", "time": "Wed Apr 09 23:50:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 23:50:35 2014 +0000" }, "message": "am 8d31358f: Merge \"Merge \"NsdService does not clean up after exiting clients\"\" into klp-modular-dev\n\n* commit \u00278d31358fb4f0f948fcfd07399d4247375dc5eea9\u0027:\n Merge \"NsdService does not clean up after exiting clients\"\n" }, { "commit": "6fdb5e6df178b3b1062ac67b505b288aa609a66b", "tree": "ee0deb7f1f9bd87e35cf6a8a7bb1d638de1c145e", "parents": [ "280fe930a432d9e2ead8c4b58ce76a0ee45742e7", "7289f3ab8f05db6206d696d75f460fadc05dc731" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Apr 09 16:47:40 2014 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Apr 09 16:47:40 2014 -0700" }, "message": "resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp\n\nChange-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded\n" }, { "commit": "2e8a2d207f446e156a8cfb9532cdfb569caa9458", "tree": "b27bd018408bf7c6cb04b0282ad30040b1851491", "parents": [ "8d31358fb4f0f948fcfd07399d4247375dc5eea9", "cc68cc962d1c90aaa0cdf2fffa68810998717517" ], "author": { "name": "Zhihai Xu", "email": "zhihaixu@google.com", "time": "Wed Apr 09 18:19:04 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 09 18:19:04 2014 +0000" }, "message": "Merge \"LE: Return false if an attribute read/write is in progress\" into klp-modular-dev" }, { "commit": "8d31358fb4f0f948fcfd07399d4247375dc5eea9", "tree": "15355333549ea2ff0edf385c661a93a6f5b564b8", "parents": [ "7289f3ab8f05db6206d696d75f460fadc05dc731", "8e5df442cd8059e56195e23edffdfd6102a944e3" ], "author": { "name": "Jesse Gunsch", "email": "gunsch@google.com", "time": "Wed Apr 09 18:09:02 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 09 18:09:03 2014 +0000" }, "message": "Merge \"Merge \"NsdService does not clean up after exiting clients\"\" into klp-modular-dev" }, { "commit": "cc68cc962d1c90aaa0cdf2fffa68810998717517", "tree": "d5de14f33091f020c29a076962c6f4793f46889a", "parents": [ "ce802f4898c5747038584596d9d689ca30c34c4e" ], "author": { "name": "Andre Eisenbach", "email": "andre@broadcom.com", "time": "Tue Mar 18 14:26:51 2014 -0700" }, "committer": { "name": "Zhihai Xu", "email": "zhihaixu@google.com", "time": "Wed Apr 09 10:59:44 2014 -0700" }, "message": "LE: Return false if an attribute read/write is in progress\n\nbug:12109128\nChange-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187\n" }, { "commit": "f7d65ae85268d0cb164cca865ebad3f94656295c", "tree": "5fe32c98b35f54af2e55cb1393483ec3251eedab", "parents": [ "7289f3ab8f05db6206d696d75f460fadc05dc731" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Wed Apr 09 09:53:03 2014 -0700" }, "committer": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Wed Apr 09 09:53:03 2014 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I974afb393ebd8cf341012d3c08cad60b578cda30\nAuto-generated-cl: translation import\n" }, { "commit": "ff0c470833b2cb4130a30895093630242d5f238d", "tree": "577b9403462e503c76bedd337106b72327a87419", "parents": [ "1378aba7aeeb7f6dd6cc2503968ba7b0e58d9333" ], "author": { "name": "Ramin Zaghi", "email": "ramin.zaghi@arm.com", "time": "Tue Apr 01 15:02:29 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 17:20:13 2014 +0100" }, "message": "System services detect and register app CPU ABIs\n\nThis patch uses the NativeLibraryHelper class to\nmatch native libraries in an .apk package with\nthose listed in \u0027ro.cpu.abilist\u0027 property.\nThe result is stored in packages.xml and the\nApplicationInfo class.\n\nThis information will be used by the ActivityManager\nto decide which zygote to use to launch the given\napp.\n\nChange-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0\n" }, { "commit": "1378aba7aeeb7f6dd6cc2503968ba7b0e58d9333", "tree": "7c69781ce86ea7fcf88775cb514a49a7824898f9", "parents": [ "a6f5e79dd182b05909fa53109e74638afcd7ee12" ], "author": { "name": "Ramin Zaghi", "email": "ramin.zaghi@arm.com", "time": "Fri Feb 28 15:03:19 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 17:16:40 2014 +0100" }, "message": "Re-implement native library search and copies.\n\nWe now use a two step approach :\n\n- First we look through the list of shared libraries in an\n APK, and choose an ABI based on the (priority) list of ABIs\n a given device supports.\n- Then we look through the list of shared libraries and copy\n all shared libraries that match the ABI we\u0027ve selected.\n\nThis fixes a long-standing bug where we would sometimes copy\na mixture of different ABIs to the device, and also allows us\nto clearly pick an ABI to run an app with.\n\nThe code in NativeLibraryHelper has been refactored so that all\nfile name validation \u0026 matching logic is done in a single place\n(NativeLibrariesIterator). This allows us to avoid a lot of\nredundant logic and straightens out a few corner cases (for eg.\nwhere the abi determination \u0026 copying logic do not agree on\nwhat files to skip).\n\nbug: https://code.google.com/p/android/issues/detail?id\u003d65053\nbug: 13647418\n\nChange-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef\nCo-Authored-By: Zhenghua Wang \u003czhenghua.wang0923@gmail.com\u003e\nCo-Authored-By: Ramin Zaghi \u003cramin.zaghi@arm.com\u003e\nCo-Authored-By: Narayan Kamath \u003cnarayan@google.com\u003e\n" }, { "commit": "280fe930a432d9e2ead8c4b58ce76a0ee45742e7", "tree": "507969b232357146434101a4f8f6e966765671ce", "parents": [ "769a247595cb78536fa159e8f5d54191a4ef90c6", "7a67c927e622bb176b21455b8ed56c76b8e0f602" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Apr 09 16:14:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 16:14:41 2014 +0000" }, "message": "am 7a67c927: am ecdf9b19: Merge \"jni: liblog reading error API incorrect\"\n\n* commit \u00277a67c927e622bb176b21455b8ed56c76b8e0f602\u0027:\n jni: liblog reading error API incorrect\n" }, { "commit": "7a67c927e622bb176b21455b8ed56c76b8e0f602", "tree": "0376bce8a5e19989c47a0587d889493f74e56441", "parents": [ "b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3", "ecdf9b199ac9659c37c34c0b23084199acea80bf" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Apr 09 16:11:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 16:11:04 2014 +0000" }, "message": "am ecdf9b19: Merge \"jni: liblog reading error API incorrect\"\n\n* commit \u0027ecdf9b199ac9659c37c34c0b23084199acea80bf\u0027:\n jni: liblog reading error API incorrect\n" }, { "commit": "ecdf9b199ac9659c37c34c0b23084199acea80bf", "tree": "20b6c8abaaa83755f1aebc7387543bb8bc14f8fc", "parents": [ "a6f5e79dd182b05909fa53109e74638afcd7ee12", "b519aeca47a7b798926c00ce5c8cf730e26e75fd" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Apr 09 16:07:47 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 09 16:07:48 2014 +0000" }, "message": "Merge \"jni: liblog reading error API incorrect\"" }, { "commit": "769a247595cb78536fa159e8f5d54191a4ef90c6", "tree": "2986b82c30d0c6fb6adc8e7e50adba4c12ec82b4", "parents": [ "9f777008eaead3cb9cee80d0c00e5a3d55de9de7", "b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 14:19:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 14:19:46 2014 +0000" }, "message": "am b6ab8c17: am a6f5e79d: Merge \"Allow connections to multiple zygotes.\"\n\n* commit \u0027b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3\u0027:\n Allow connections to multiple zygotes.\n" }, { "commit": "b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3", "tree": "005e320c4ee96cec30ec20c810a28a2cf205fe26", "parents": [ "05f980d42d4926ab2130cdcf9e646eb610a7080b", "a6f5e79dd182b05909fa53109e74638afcd7ee12" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 14:15:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 14:15:16 2014 +0000" }, "message": "am a6f5e79d: Merge \"Allow connections to multiple zygotes.\"\n\n* commit \u0027a6f5e79dd182b05909fa53109e74638afcd7ee12\u0027:\n Allow connections to multiple zygotes.\n" }, { "commit": "a6f5e79dd182b05909fa53109e74638afcd7ee12", "tree": "86dc3cec3d49374b937ae0d205c98b4b5eefa38e", "parents": [ "d4b644092e8d2719d01ad297b080bd50b1fdf60d", "4444dcd0adc7e035cca030b90ed91f0cff9a772b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 14:12:22 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 09 14:12:23 2014 +0000" }, "message": "Merge \"Allow connections to multiple zygotes.\"" }, { "commit": "4444dcd0adc7e035cca030b90ed91f0cff9a772b", "tree": "86dc3cec3d49374b937ae0d205c98b4b5eefa38e", "parents": [ "d4b644092e8d2719d01ad297b080bd50b1fdf60d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 03 20:15:15 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 15:07:10 2014 +0100" }, "message": "Allow connections to multiple zygotes.\n\nAdds a new String argument \"abi\" to Process.start.\nThis method will now query the zygotes to\ndetermine what ABIs the primary and the secondary\nzygote support (the secondary is optional) and dispatch\na fork request over the right zygote connection.\n\nBoth zygotes are assumed to be active at all points.\n\nChange-Id: I460319b4481ff1c1666e8172223691820658a35c\n" }, { "commit": "9f777008eaead3cb9cee80d0c00e5a3d55de9de7", "tree": "95241374d0e30c18b265fb376a65ca3ec84d8a70", "parents": [ "97175deb446cdaca7f3910b71940cb443bda3cc4", "05f980d42d4926ab2130cdcf9e646eb610a7080b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 14:02:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 14:02:18 2014 +0000" }, "message": "am 05f980d4: am d4b64409: Merge \"Make zygotes aware of their supported ABIs.\"\n\n* commit \u002705f980d42d4926ab2130cdcf9e646eb610a7080b\u0027:\n Make zygotes aware of their supported ABIs.\n" }, { "commit": "97175deb446cdaca7f3910b71940cb443bda3cc4", "tree": "7f316f4f074f8427d3046f99b683b97136cc3b14", "parents": [ "dc7eb9c947f36cbd34021663845bcbb090c3169d", "3856a219fa414ee53c5ef3a0c35dae35e2ca80b1" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 14:02:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 14:02:08 2014 +0000" }, "message": "am 3856a219: am cecfb94f: Merge \"Clean up argc / argv processing for runtime args.\"\n\n* commit \u00273856a219fa414ee53c5ef3a0c35dae35e2ca80b1\u0027:\n Clean up argc / argv processing for runtime args.\n" }, { "commit": "05f980d42d4926ab2130cdcf9e646eb610a7080b", "tree": "aec511c7f5dfc4fcccde448148f7b28097802efd", "parents": [ "3856a219fa414ee53c5ef3a0c35dae35e2ca80b1", "d4b644092e8d2719d01ad297b080bd50b1fdf60d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 13:59:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 13:59:00 2014 +0000" }, "message": "am d4b64409: Merge \"Make zygotes aware of their supported ABIs.\"\n\n* commit \u0027d4b644092e8d2719d01ad297b080bd50b1fdf60d\u0027:\n Make zygotes aware of their supported ABIs.\n" }, { "commit": "3856a219fa414ee53c5ef3a0c35dae35e2ca80b1", "tree": "1c110f9e2835a976ba74fcb62f8f0ab0da4e9980", "parents": [ "00cfbe82fa80ef57f3b1c34e47836d3e28c381b8", "cecfb94f3f1b2978ba66342d7920e83770c808e3" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 13:58:57 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 13:58:57 2014 +0000" }, "message": "am cecfb94f: Merge \"Clean up argc / argv processing for runtime args.\"\n\n* commit \u0027cecfb94f3f1b2978ba66342d7920e83770c808e3\u0027:\n Clean up argc / argv processing for runtime args.\n" }, { "commit": "d4b644092e8d2719d01ad297b080bd50b1fdf60d", "tree": "06f51dec3427c6e8322816b2e43f2bb784f28fe0", "parents": [ "cecfb94f3f1b2978ba66342d7920e83770c808e3", "c41638cb759ce569630ffae4c5c4cdee1b0f3b82" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 13:55:55 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 09 13:55:58 2014 +0000" }, "message": "Merge \"Make zygotes aware of their supported ABIs.\"" }, { "commit": "cecfb94f3f1b2978ba66342d7920e83770c808e3", "tree": "f5ca6c4f0055e8c4ef01cf484abc65d983ec990b", "parents": [ "a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0", "22ec1eefa4dc8e12f7da8e8750d4770144941526" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 13:55:54 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 09 13:55:54 2014 +0000" }, "message": "Merge \"Clean up argc / argv processing for runtime args.\"" }, { "commit": "c41638cb759ce569630ffae4c5c4cdee1b0f3b82", "tree": "06f51dec3427c6e8322816b2e43f2bb784f28fe0", "parents": [ "22ec1eefa4dc8e12f7da8e8750d4770144941526" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Apr 07 13:56:15 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 13:41:15 2014 +0100" }, "message": "Make zygotes aware of their supported ABIs.\n\nQuery system properties for the list of ABIs and pass\nit as a command line argument to ZygoteInit.\n\nAlso add a new Zygote command that returns this list of\nABIs to peers.\n\nChange-Id: I68034c6f63fa626911122579a011a0a25a8cda94\n" }, { "commit": "22ec1eefa4dc8e12f7da8e8750d4770144941526", "tree": "f5ca6c4f0055e8c4ef01cf484abc65d983ec990b", "parents": [ "a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Apr 07 12:44:58 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 13:39:41 2014 +0100" }, "message": "Clean up argc / argv processing for runtime args.\n\n- Make copies of argc, argv before argv is potentially\n overwritten with the process name.\n- Allow multiple command line arguments to be passed to\n ZygoteInit (this is required for some of the 64 bit\n zygote work).\n- Add an explanatory comment about how these argments\n are processed.\n\nChange-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0\n" }, { "commit": "dc7eb9c947f36cbd34021663845bcbb090c3169d", "tree": "06bebce5d2edec49036fa8dcac06a1ef0a016e40", "parents": [ "7f9599d63c892934c7f8a2e46d1e518ddb0d43df", "00cfbe82fa80ef57f3b1c34e47836d3e28c381b8" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 11:33:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 11:33:20 2014 +0000" }, "message": "am 00cfbe82: am a5608acb: Merge \"Don\\\u0027t allow MemoryFiles of negative length.\"\n\n* commit \u002700cfbe82fa80ef57f3b1c34e47836d3e28c381b8\u0027:\n Don\u0027t allow MemoryFiles of negative length.\n" }, { "commit": "7f9599d63c892934c7f8a2e46d1e518ddb0d43df", "tree": "6cb03cde27062bdd6cc136caa20e5fe1e41195ae", "parents": [ "668b1bf80b0e34e7079f826cd9e7358835a1e9cd", "ea72cdf22f8efde4d3b872a60587e4b26bc93e43" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Apr 09 09:12:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 09:12:40 2014 +0000" }, "message": "am ea72cdf2: Merge \"Move display power controller to display manager service. (DO NOT MERGE)\" into klp-modular-dev\n\n* commit \u0027ea72cdf22f8efde4d3b872a60587e4b26bc93e43\u0027:\n Move display power controller to display manager service. (DO NOT MERGE)\n" }, { "commit": "00cfbe82fa80ef57f3b1c34e47836d3e28c381b8", "tree": "4509663b26592cf132a5a71367702fbf6236ea8c", "parents": [ "228cefa83dd7b95e5581f619bb597808af726f80", "a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 09:09:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 09:09:58 2014 +0000" }, "message": "am a5608acb: Merge \"Don\\\u0027t allow MemoryFiles of negative length.\"\n\n* commit \u0027a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0\u0027:\n Don\u0027t allow MemoryFiles of negative length.\n" }, { "commit": "a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0", "tree": "5ceffece26a391c8a1c824cd1b750d08dd31898a", "parents": [ "3fb2b7132b64c65163e7c6cd948e45f703e93687", "f626ca2c96f629627a8df6944c9b0d774e6e67ae" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 09:07:29 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 09 09:07:29 2014 +0000" }, "message": "Merge \"Don\u0027t allow MemoryFiles of negative length.\"" }, { "commit": "7289f3ab8f05db6206d696d75f460fadc05dc731", "tree": "73cd2bc9edaeb53467b875c1447211bd4def9ac7", "parents": [ "ea72cdf22f8efde4d3b872a60587e4b26bc93e43", "13014b5fe5967b3c7e232ffaf81581ed178e6df6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Apr 09 04:36:51 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 09 04:36:51 2014 +0000" }, "message": "Merge \"Move certain internal activity manager methods to new class.\" into klp-modular-dev" }, { "commit": "ea72cdf22f8efde4d3b872a60587e4b26bc93e43", "tree": "7124f7b1be1d76d102418186278c59d73e2ea413", "parents": [ "bd6c5577ab0790415b99d24f41b7b3cdd823449d", "ad9ef191f50767d8d5b6f0fbd4b59bb1400dcd25" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Apr 09 04:33:27 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 09 04:33:27 2014 +0000" }, "message": "Merge \"Move display power controller to display manager service. (DO NOT MERGE)\" into klp-modular-dev" }, { "commit": "13014b5fe5967b3c7e232ffaf81581ed178e6df6", "tree": "4771e759f79cdffe26ac7480983ea2e1f0988082", "parents": [ "ad9ef191f50767d8d5b6f0fbd4b59bb1400dcd25" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Apr 07 19:45:27 2014 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Apr 08 20:51:07 2014 -0700" }, "message": "Move certain internal activity manager methods to new class.\n\nThis is a little bit of refactoring in preparation for changing how\nthe power manager notifies system components about changes in power\nstate.\n\nDeleted the startRunning method since it is no longer useful.\n\nBug: 13133142\nChange-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea\n" }, { "commit": "ad9ef191f50767d8d5b6f0fbd4b59bb1400dcd25", "tree": "78e2f02c59770e9be7c865b4e2bc663445639b1b", "parents": [ "ce802f4898c5747038584596d9d689ca30c34c4e" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Apr 08 17:26:30 2014 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Apr 08 20:41:46 2014 -0700" }, "message": "Move display power controller to display manager service. (DO NOT MERGE)\n\nThis refactoring is in preparation for enabling the display manager\nto have more control over the blanking state of individual displays.\nThere are no functional changes. Some bits will be cleaned up in\na subsequent patch.\n\nBug: 13133142\nChange-Id: Ib811835e8757449c7899ac61807029baaf998161\n" }, { "commit": "8e5df442cd8059e56195e23edffdfd6102a944e3", "tree": "d7d9640e63f4438c4864a24c7969f0a48cd92365", "parents": [ "8e63696a73dfebae9b2ec123611db6b21968dbfd" ], "author": { "name": "Dave Platt", "email": "dplatt@google.com", "time": "Thu Mar 13 23:35:15 2014 +0000" }, "committer": { "name": "Jesse Gunsch", "email": "gunsch@google.com", "time": "Tue Apr 08 17:35:57 2014 -0700" }, "message": "Merge \"NsdService does not clean up after exiting clients\"\n" }, { "commit": "b519aeca47a7b798926c00ce5c8cf730e26e75fd", "tree": "d665dd7d7f51e2011c54672e4a24ee64629b864a", "parents": [ "3fb2b7132b64c65163e7c6cd948e45f703e93687" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 08 15:21:50 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 08 16:17:51 2014 -0700" }, "message": "jni: liblog reading error API incorrect\n\n- return value contains -errno on error.\n\nBug: 13907124\nChange-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5\n" }, { "commit": "668b1bf80b0e34e7079f826cd9e7358835a1e9cd", "tree": "153ee3ce06efcfb1f1e75cfa04d1016b39bd92cc", "parents": [ "56868fbcd9b086219c4350ac34b5dfdde127c5b9", "bd6c5577ab0790415b99d24f41b7b3cdd823449d" ], "author": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Tue Apr 08 10:24:47 2014 -0700" }, "committer": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Tue Apr 08 10:24:47 2014 -0700" }, "message": "resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp\n\nChange-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f\n" }, { "commit": "bd6c5577ab0790415b99d24f41b7b3cdd823449d", "tree": "8c2a86c34b2545dd77193110a79fc886ca5cfa37", "parents": [ "0cf836a77821afe8ff6cdfdaa3b55987cb6317da", "c74221594d51c9b30a365ba0c621f00f70bd1a60" ], "author": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Tue Apr 08 15:51:22 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 08 15:51:23 2014 +0000" }, "message": "Merge \"DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.\" into klp-modular-dev" }, { "commit": "f626ca2c96f629627a8df6944c9b0d774e6e67ae", "tree": "997b18ade316ba1fc66910a292f50ac775ea68b9", "parents": [ "dc97144b3f83bf6dae90493a6631afc6523dfce2" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Apr 08 16:10:52 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Apr 08 16:14:10 2014 +0100" }, "message": "Don\u0027t allow MemoryFiles of negative length.\n\nPrevents us from converting a (signed) jint into an\n(unsigned) size_t and having horrible things happen.\n\nChange-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4\n" }, { "commit": "56868fbcd9b086219c4350ac34b5dfdde127c5b9", "tree": "153ee3ce06efcfb1f1e75cfa04d1016b39bd92cc", "parents": [ "8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a", "0cf836a77821afe8ff6cdfdaa3b55987cb6317da" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Tue Apr 08 02:20:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 08 02:20:37 2014 +0000" }, "message": "am 0cf836a7: (-s ours) Merge \"Import translations. DO NOT MERGE\" into klp-modular-dev\n\n* commit \u00270cf836a77821afe8ff6cdfdaa3b55987cb6317da\u0027:\n Import translations. DO NOT MERGE\n" }, { "commit": "0cf836a77821afe8ff6cdfdaa3b55987cb6317da", "tree": "9fd7d1eb0b4ad3ac123038a1934cabe2cb05d7e3", "parents": [ "ce802f4898c5747038584596d9d689ca30c34c4e", "c4a80acf9c79a519862281ce7e40914666e11068" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Tue Apr 08 02:16:35 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 08 02:16:36 2014 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into klp-modular-dev" }, { "commit": "c74221594d51c9b30a365ba0c621f00f70bd1a60", "tree": "90159007a0b5cd39efd69606d169c7c7881aff42", "parents": [ "17878a9ab5c58f5b245bbdd0e8e16abbcde4a995" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Feb 14 17:14:09 2014 +0000" }, "committer": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Mon Apr 07 16:45:05 2014 -0700" }, "message": "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.\n\nThis value is overridden by the framework anyway\n(see ActivityThread.handleBindApplication). Besides,\nit doesn\u0027t seem like a great idea to let tools clutter\n/sdcard/ with temp files.\n\n(cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125)\n\nBug: 13763685\nBug: 13763900\n\nChange-Id: I26c710cbea7397f89e6103e54a73044a87da95b1\n" }, { "commit": "8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a", "tree": "153ee3ce06efcfb1f1e75cfa04d1016b39bd92cc", "parents": [ "ec571bd203bb543aa1489e0c0a8bb67f5491630e", "228cefa83dd7b95e5581f619bb597808af726f80" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Apr 07 22:21:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 22:21:33 2014 +0000" }, "message": "am 228cefa8: am 3fb2b713: Merge \"[ActivityManager] Reduce report ANR on wrong activity.\"\n\n* commit \u0027228cefa83dd7b95e5581f619bb597808af726f80\u0027:\n [ActivityManager] Reduce report ANR on wrong activity.\n" }, { "commit": "228cefa83dd7b95e5581f619bb597808af726f80", "tree": "3c7b75c2b67cb25fad09eb16a1d916227bae4286", "parents": [ "4ed27328b5e20d32b1e6ac5b39684dad3e737ca7", "3fb2b7132b64c65163e7c6cd948e45f703e93687" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Apr 07 22:14:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 22:14:56 2014 +0000" }, "message": "am 3fb2b713: Merge \"[ActivityManager] Reduce report ANR on wrong activity.\"\n\n* commit \u00273fb2b7132b64c65163e7c6cd948e45f703e93687\u0027:\n [ActivityManager] Reduce report ANR on wrong activity.\n" }, { "commit": "3fb2b7132b64c65163e7c6cd948e45f703e93687", "tree": "5c65d767e7df3cf80efa9102647cc29a4336054e", "parents": [ "dc97144b3f83bf6dae90493a6631afc6523dfce2", "309ca5d947fffc6a8196be5e5148333803d442af" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Apr 07 22:10:47 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 07 22:10:47 2014 +0000" }, "message": "Merge \"[ActivityManager] Reduce report ANR on wrong activity.\"" }, { "commit": "ec571bd203bb543aa1489e0c0a8bb67f5491630e", "tree": "c974260ef89ae8d03056dace40fa43e91088604e", "parents": [ "4455c5999f72daaf6f15c4394e413976f14337d3", "ce802f4898c5747038584596d9d689ca30c34c4e" ], "author": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Mon Apr 07 21:33:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 21:33:54 2014 +0000" }, "message": "am ce802f48: Merge \"DO NOT MERGE Fix several bad function definitions.\" into klp-modular-dev\n\n* commit \u0027ce802f4898c5747038584596d9d689ca30c34c4e\u0027:\n DO NOT MERGE Fix several bad function definitions.\n" }, { "commit": "ce802f4898c5747038584596d9d689ca30c34c4e", "tree": "fc557ddb131ab2fbfed28b78238b847d3b16b804", "parents": [ "0468e3c7fae6945e21314ae2971c51dcb36972ee", "5a7468f59824aca2bf28502d5dc79ab3b92e3797" ], "author": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Mon Apr 07 21:27:53 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 07 21:27:53 2014 +0000" }, "message": "Merge \"DO NOT MERGE Fix several bad function definitions.\" into klp-modular-dev" }, { "commit": "4455c5999f72daaf6f15c4394e413976f14337d3", "tree": "c974260ef89ae8d03056dace40fa43e91088604e", "parents": [ "f00b906f01319a8177d2e2ab109ff01016b0bf4c", "0468e3c7fae6945e21314ae2971c51dcb36972ee" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:52:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:52:59 2014 +0000" }, "message": "am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u00270468e3c7fae6945e21314ae2971c51dcb36972ee\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "0468e3c7fae6945e21314ae2971c51dcb36972ee", "tree": "b919b9dad525dff6dd98e8ae0bf41248c24c6719", "parents": [ "cb163c684d7a364684ef5b1a1937aa2e92856906", "e1d4847c120f4ab72b3acfed17c0015bdb2befaf" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:46:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:46:58 2014 +0000" }, "message": "am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027e1d4847c120f4ab72b3acfed17c0015bdb2befaf\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "f00b906f01319a8177d2e2ab109ff01016b0bf4c", "tree": "c974260ef89ae8d03056dace40fa43e91088604e", "parents": [ "f403d60fc8dfe2b833a65b6933a07c44d849e831", "cb163c684d7a364684ef5b1a1937aa2e92856906" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:43:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:43:55 2014 +0000" }, "message": "am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u0027cb163c684d7a364684ef5b1a1937aa2e92856906\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "e1d4847c120f4ab72b3acfed17c0015bdb2befaf", "tree": "45dff3b0183310d1b92bc3a402e68497edffca09", "parents": [ "c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9", "331fa429cad1f464f0375a3466ba528b03c6e90d" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:41:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:41:00 2014 +0000" }, "message": "am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027331fa429cad1f464f0375a3466ba528b03c6e90d\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "cb163c684d7a364684ef5b1a1937aa2e92856906", "tree": "b919b9dad525dff6dd98e8ae0bf41248c24c6719", "parents": [ "17878a9ab5c58f5b245bbdd0e8e16abbcde4a995", "c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:37:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:37:38 2014 +0000" }, "message": "am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u0027c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "331fa429cad1f464f0375a3466ba528b03c6e90d", "tree": "8ded79c478100dc5922dd2bf5ca1c9aa8a51a997", "parents": [ "5f3c0630e488bbcee687933b6350370a42354dc4", "a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:34:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:34:49 2014 +0000" }, "message": "am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9", "tree": "45dff3b0183310d1b92bc3a402e68497edffca09", "parents": [ "b430ec756473330f47bda2d8f0c266b3398169c9", "5f3c0630e488bbcee687933b6350370a42354dc4" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:31:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:31:45 2014 +0000" }, "message": "am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u00275f3c0630e488bbcee687933b6350370a42354dc4\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312", "tree": "dcf86718d56c1fc6a096a1b5d760b108b2b0c6c8", "parents": [ "522bd7fb3468bc07133c7ff1a02033dcced740b9", "463eeb70938403bdca2519d9b71911aab93b9277" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:27:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:27:50 2014 +0000" }, "message": "am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027463eeb70938403bdca2519d9b71911aab93b9277\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "5f3c0630e488bbcee687933b6350370a42354dc4", "tree": "8ded79c478100dc5922dd2bf5ca1c9aa8a51a997", "parents": [ "81e62eb1e576388866779e6f29d71614892dcf8a", "522bd7fb3468bc07133c7ff1a02033dcced740b9" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:26:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:26:35 2014 +0000" }, "message": "am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u0027522bd7fb3468bc07133c7ff1a02033dcced740b9\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "463eeb70938403bdca2519d9b71911aab93b9277", "tree": "2d8be0d8619fe3e6574b6ae1cedb1f6c70c087c0", "parents": [ "24444abff4ad45b731d4f6cd92afed79568773d8", "2676e36ff6fc3f779cb6f1b0db13e26d734dcbab" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:21:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:21:52 2014 +0000" }, "message": "am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u00272676e36ff6fc3f779cb6f1b0db13e26d734dcbab\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "522bd7fb3468bc07133c7ff1a02033dcced740b9", "tree": "dcf86718d56c1fc6a096a1b5d760b108b2b0c6c8", "parents": [ "9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08", "24444abff4ad45b731d4f6cd92afed79568773d8" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:18:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:18:41 2014 +0000" }, "message": "am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u002724444abff4ad45b731d4f6cd92afed79568773d8\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "2676e36ff6fc3f779cb6f1b0db13e26d734dcbab", "tree": "841ee0b3c5ea3e9d824457377dd44757de7200b8", "parents": [ "53691e39dca8be5dbe19bfef05b1c3e294d6c0bd", "3e604b1198fcab0e3bf2fd29043e4172193db2b5" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:16:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:16:15 2014 +0000" }, "message": "am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u00273e604b1198fcab0e3bf2fd29043e4172193db2b5\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "24444abff4ad45b731d4f6cd92afed79568773d8", "tree": "2d8be0d8619fe3e6574b6ae1cedb1f6c70c087c0", "parents": [ "30e59135b11d196cac2edd97d1ccca3471f3e398", "53691e39dca8be5dbe19bfef05b1c3e294d6c0bd" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:12:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:12:56 2014 +0000" }, "message": "am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u002753691e39dca8be5dbe19bfef05b1c3e294d6c0bd\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "3e604b1198fcab0e3bf2fd29043e4172193db2b5", "tree": "a1e06628f26ef9892e6f14f6511ec5ab6c600733", "parents": [ "128e937108035b77537f279dc0bc85a116906819", "2c90609c0bddb6fbe255e5632a1e6639e760290f" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:09:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:09:33 2014 +0000" }, "message": "am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u00272c90609c0bddb6fbe255e5632a1e6639e760290f\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "53691e39dca8be5dbe19bfef05b1c3e294d6c0bd", "tree": "841ee0b3c5ea3e9d824457377dd44757de7200b8", "parents": [ "c07a48bed2c772dc548423396b208331b22a679a", "128e937108035b77537f279dc0bc85a116906819" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:07:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:07:10 2014 +0000" }, "message": "am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u0027128e937108035b77537f279dc0bc85a116906819\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "2c90609c0bddb6fbe255e5632a1e6639e760290f", "tree": "454d6f726253e81d41414a57e2bbd8f3c6a01106", "parents": [ "106627e07cecfa8a9bcc43578fde78652fc59eba", "339cfdbde333984d02d189249f46e7b13317baed" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:03:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:03:55 2014 +0000" }, "message": "am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027339cfdbde333984d02d189249f46e7b13317baed\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "128e937108035b77537f279dc0bc85a116906819", "tree": "a1e06628f26ef9892e6f14f6511ec5ab6c600733", "parents": [ "efbe7cc0ff5c85cc7956bb3099402c7ebbe20591", "106627e07cecfa8a9bcc43578fde78652fc59eba" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 20:00:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 20:00:33 2014 +0000" }, "message": "am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u0027106627e07cecfa8a9bcc43578fde78652fc59eba\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "339cfdbde333984d02d189249f46e7b13317baed", "tree": "13294a9831d59327211e08c190caa5a0d0039d29", "parents": [ "e42ce676f54742f2d47c26adaa90407c2cb8cec8", "72f9b3084cf8bf0ca01ba52a853faeeb74acdad4" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:57:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:57:32 2014 +0000" }, "message": "am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u002772f9b3084cf8bf0ca01ba52a853faeeb74acdad4\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "106627e07cecfa8a9bcc43578fde78652fc59eba", "tree": "454d6f726253e81d41414a57e2bbd8f3c6a01106", "parents": [ "d1c82f8fc22216e9b544e3a3b521bcad05bc113d", "e42ce676f54742f2d47c26adaa90407c2cb8cec8" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:54:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:54:13 2014 +0000" }, "message": "am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u0027e42ce676f54742f2d47c26adaa90407c2cb8cec8\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "72f9b3084cf8bf0ca01ba52a853faeeb74acdad4", "tree": "8c631c4242b8785673c3c7ff9e6012275642b51a", "parents": [ "ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c", "4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:51:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:51:34 2014 +0000" }, "message": "am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u00274bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "e42ce676f54742f2d47c26adaa90407c2cb8cec8", "tree": "13294a9831d59327211e08c190caa5a0d0039d29", "parents": [ "1cb3c1d381c389c7ef903c1a871ff695cd406da4", "ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:48:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:48:39 2014 +0000" }, "message": "am ebf23a8d: am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u0027ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b", "tree": "8c631c4242b8785673c3c7ff9e6012275642b51a", "parents": [ "74acf23a1eef75628c8fa9e2ff7ba08ed4258558", "c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:47:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:47:49 2014 +0000" }, "message": "am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e", "tree": "a27c7d5955ebb66a8bc70d4cef6deda15d879603", "parents": [ "3c417fbf21133340cbbe3539d87c453f81ae3a9d", "f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:42:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:42:49 2014 +0000" }, "message": "am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c", "tree": "8c631c4242b8785673c3c7ff9e6012275642b51a", "parents": [ "fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1", "74acf23a1eef75628c8fa9e2ff7ba08ed4258558" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:42:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:42:32 2014 +0000" }, "message": "am 74acf23a: am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u002774acf23a1eef75628c8fa9e2ff7ba08ed4258558\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b", "tree": "8ea4af3ba79241145f5033498b4f6c03f3f16530", "parents": [ "534f3e9438a0e2e97df2d371be834d65720b2eb9", "fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:36:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:36:54 2014 +0000" }, "message": "am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs\n\n* commit \u0027fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "74acf23a1eef75628c8fa9e2ff7ba08ed4258558", "tree": "8c631c4242b8785673c3c7ff9e6012275642b51a", "parents": [ "7bd0b65233d0ef34114ecb93d734dfe4351f470d", "3c417fbf21133340cbbe3539d87c453f81ae3a9d" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:36:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Apr 07 19:36:44 2014 +0000" }, "message": "am 3c417fbf: Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev\n\n* commit \u00273c417fbf21133340cbbe3539d87c453f81ae3a9d\u0027:\n DO NOT MERGE Sanitize WifiConfigs\n" }, { "commit": "3c417fbf21133340cbbe3539d87c453f81ae3a9d", "tree": "a27c7d5955ebb66a8bc70d4cef6deda15d879603", "parents": [ "4bdab6bb4c55661d4915518b1190e30c4633c6a5", "e1549ae364cc368641994f478959b8736a183f8e" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Apr 07 19:30:10 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 07 19:30:10 2014 +0000" }, "message": "Merge \"DO NOT MERGE Sanitize WifiConfigs\" into jb-mr1-dev" }, { "commit": "309ca5d947fffc6a8196be5e5148333803d442af", "tree": "5c65d767e7df3cf80efa9102647cc29a4336054e", "parents": [ "dc97144b3f83bf6dae90493a6631afc6523dfce2" ], "author": { "name": "riddle_hsu", "email": "riddle_hsu@htc.com", "time": "Tue Apr 08 02:44:03 2014 +0800" }, "committer": { "name": "riddle_hsu", "email": "riddle_hsu@htc.com", "time": "Tue Apr 08 02:44:03 2014 +0800" }, "message": "[ActivityManager] Reduce report ANR on wrong activity.\n\nSymptom: ANR report on wrong activity.\n\nRoot Cause:\n KK changed resume behavior that will not update focus when only resume,\nif the activity blocked, it may report ANR on previous focus.\n By original concept, it will try to correct the ANR target,\nbut the stack of waiting(waitingVisible\u003dtrue) activity may\ndifferent with current top stack.\n If it gets key dispatch timeout, mResumedActivity and mPausingActivity\nof its stack will be null becuase it is not top stack.\nThen it is unable to change ANR target to the real no response activity.\n\nSolution:\n Use focused stack to get the real culprit.\n\nReproduce steps:\n1.Launch an Activity X from launcher, press home key.\n2.Launch X from launcher again, X blocks(sleeps 15sec) in onResume, press back key in the beginning of blocking duration.\n3.ANR dialog shows launcher is no response.\n\nChange-Id: I99416ad91e349096f995990f2240a97616fbaf28\n" }, { "commit": "c4a80acf9c79a519862281ce7e40914666e11068", "tree": "f96450f507be1da9623cce8b3d38734c8f55f642", "parents": [ "17878a9ab5c58f5b245bbdd0e8e16abbcde4a995" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Mon Apr 07 09:16:57 2014 -0700" }, "committer": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Mon Apr 07 09:16:57 2014 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693\nAuto-generated-cl: translation import\n" }, { "commit": "f403d60fc8dfe2b833a65b6933a07c44d849e831", "tree": "c974260ef89ae8d03056dace40fa43e91088604e", "parents": [ "acf395fd9441bce9fbe68c1b7efbf824570284bc", "17878a9ab5c58f5b245bbdd0e8e16abbcde4a995" ], "author": { "name": "quddusc", "email": "quddusc@google.com", "time": "Sat Apr 05 22:38:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 05 22:38:52 2014 +0000" }, "message": "am 17878a9a: am b430ec75: am 7db3875c: Merge \"docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101\" into klp-docs\n\n* commit \u002717878a9ab5c58f5b245bbdd0e8e16abbcde4a995\u0027:\n docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101\n" }, { "commit": "17878a9ab5c58f5b245bbdd0e8e16abbcde4a995", "tree": "b919b9dad525dff6dd98e8ae0bf41248c24c6719", "parents": [ "819239e5bec90ee3c861ac45fffac4a832a183a1", "b430ec756473330f47bda2d8f0c266b3398169c9" ], "author": { "name": "quddusc", "email": "quddusc@google.com", "time": "Sat Apr 05 22:32:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 05 22:32:35 2014 +0000" }, "message": "am b430ec75: am 7db3875c: Merge \"docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101\" into klp-docs\n\n* commit \u0027b430ec756473330f47bda2d8f0c266b3398169c9\u0027:\n docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101\n" }, { "commit": "b430ec756473330f47bda2d8f0c266b3398169c9", "tree": "45dff3b0183310d1b92bc3a402e68497edffca09", "parents": [ "f7bffe7707f31da920a8ff08d013934562e9a43d", "7db3875cdca4c94cb667d2d0cc86718f15e3305c" ], "author": { "name": "quddusc", "email": "quddusc@google.com", "time": "Sat Apr 05 22:27:25 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 05 22:27:25 2014 +0000" }, "message": "am 7db3875c: Merge \"docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101\" into klp-docs\n\n* commit \u00277db3875cdca4c94cb667d2d0cc86718f15e3305c\u0027:\n docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101\n" }, { "commit": "7db3875cdca4c94cb667d2d0cc86718f15e3305c", "tree": "076729344971f0f1673e2d9db8309f62da2249a2", "parents": [ "fc8ea92df15689d51079212d7d012756ce9298d2", "3d7b134d08e7a4f334faa1bd3f3acc23081c0493" ], "author": { "name": "quddusc", "email": "quddusc@google.com", "time": "Sat Apr 05 22:23:35 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Apr 05 22:23:36 2014 +0000" }, "message": "Merge \"docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101\" into klp-docs" }, { "commit": "acf395fd9441bce9fbe68c1b7efbf824570284bc", "tree": "de95b1b5999e82a26832560cfdfa7cf663bd6973", "parents": [ "bdfe384106de364ea2effac6ab80108556d11649", "819239e5bec90ee3c861ac45fffac4a832a183a1" ], "author": { "name": "Etienne Le Grand", "email": "etn@google.com", "time": "Sat Apr 05 09:05:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 05 09:05:50 2014 +0000" }, "message": "am 819239e5: Revert \"Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor\"\n\n* commit \u0027819239e5bec90ee3c861ac45fffac4a832a183a1\u0027:\n Revert \"Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor\"\n" }, { "commit": "819239e5bec90ee3c861ac45fffac4a832a183a1", "tree": "1191459c7cfef8e68928b0d1b320116fc7c8e2a3", "parents": [ "fd53d8352a4617941b0a0449390aa562a01ea1d3" ], "author": { "name": "Etienne Le Grand", "email": "etn@google.com", "time": "Sat Apr 05 04:47:14 2014 +0000" }, "committer": { "name": "Etienne Le Grand", "email": "etn@google.com", "time": "Sat Apr 05 04:47:14 2014 +0000" }, "message": "Revert \"Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor\"\n\nThis reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.\n\nChange-Id: I1c6322d1d992147bb5ef201238374966128c1a61\n" }, { "commit": "bdfe384106de364ea2effac6ab80108556d11649", "tree": "a35fa2f1dffa3cd29947563ed584a4115b7a634c", "parents": [ "8e2a4b539509f03c4b3521574a910f2ea3296a66", "fd53d8352a4617941b0a0449390aa562a01ea1d3" ], "author": { "name": "Etienne Le Grand", "email": "etn@google.com", "time": "Sat Apr 05 01:52:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 05 01:52:27 2014 +0000" }, "message": "am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor\n\n* commit \u0027fd53d8352a4617941b0a0449390aa562a01ea1d3\u0027:\n Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor\n" }, { "commit": "8e2a4b539509f03c4b3521574a910f2ea3296a66", "tree": "de95b1b5999e82a26832560cfdfa7cf663bd6973", "parents": [ "de4fedefbf4772e15bb9aa95458fd2f314cdb502", "4ed27328b5e20d32b1e6ac5b39684dad3e737ca7" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Apr 04 23:31:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 04 23:31:44 2014 +0000" }, "message": "am 4ed27328: am dc97144b: Merge \"Always call super.onCreate(). Always.\"\n\n* commit \u00274ed27328b5e20d32b1e6ac5b39684dad3e737ca7\u0027:\n Always call super.onCreate(). Always.\n" }, { "commit": "fd53d8352a4617941b0a0449390aa562a01ea1d3", "tree": "d073c795af27b374151ddb9481e3789924d1614c", "parents": [ "8e63696a73dfebae9b2ec123611db6b21968dbfd" ], "author": { "name": "Etienne Le Grand", "email": "etn@google.com", "time": "Mon Mar 24 21:29:28 2014 -0700" }, "committer": { "name": "Etienne Le Grand", "email": "etn@google.com", "time": "Fri Apr 04 16:31:08 2014 -0700" }, "message": "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor\n\nChange-Id: I16e5da68f860494e24cca64075be76fad02617bc\n" } ], "next": "4ed27328b5e20d32b1e6ac5b39684dad3e737ca7" }