)]}' { "log": [ { "commit": "09384303dea4f3f01d5682918d7bab9bf83a02b1", "tree": "8b1c7e3e736cd8e2fdc0964ea5c71d08536452eb", "parents": [ "6873e17d4b565aa1d4ea2a8f1ac261f517dcc2ff" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jan 22 16:07:42 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jan 23 12:43:42 2014 -0800" }, "message": "Add support for multiple asset dirs (-A)\n\nBug: 12608034\nChange-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11\n" }, { "commit": "6873e17d4b565aa1d4ea2a8f1ac261f517dcc2ff", "tree": "e82cf7c0326acff63ff2e792c7da6537d7accb5f", "parents": [ "595ddb89118a33743a05d20bc6c70f8b7a10406d", "305c61a1c6816549b225719518df5b29a17f0f42" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jan 14 01:53:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 01:53:07 2014 +0000" }, "message": "am 305c61a1: am 3a8a8ddd: am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n\n* commit \u0027305c61a1c6816549b225719518df5b29a17f0f42\u0027:\n Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n" }, { "commit": "305c61a1c6816549b225719518df5b29a17f0f42", "tree": "69447e52472494a16d7bd562c79ac05aa71fd32b", "parents": [ "03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c", "3a8a8ddd7cff03e39d4cb104ddb1d0401b6c7ede" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jan 14 01:47:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 01:47:15 2014 +0000" }, "message": "am 3a8a8ddd: am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n\n* commit \u00273a8a8ddd7cff03e39d4cb104ddb1d0401b6c7ede\u0027:\n Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n" }, { "commit": "3a8a8ddd7cff03e39d4cb104ddb1d0401b6c7ede", "tree": "c3b76ee1b21d86e0b063d18565f0be0aaa437dab", "parents": [ "9865216eb1c747b03cb60245772b196fc039a1b6", "8c359bf473b4c31407613dbc1473ba49b0297898" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jan 13 17:45:16 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 17:45:16 2014 -0800" }, "message": "am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n\n* commit \u00278c359bf473b4c31407613dbc1473ba49b0297898\u0027:\n Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n" }, { "commit": "8c359bf473b4c31407613dbc1473ba49b0297898", "tree": "d13fda3cd83deed7c2cbe718a23bb7bc53b84081", "parents": [ "18bf3b1df67f219d70e6cba828216a47d92e3dc5", "c174288d345d4a80b326b12ff4c10a6c99570997" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jan 13 17:42:01 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 17:42:01 2014 -0800" }, "message": "am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n\n* commit \u0027c174288d345d4a80b326b12ff4c10a6c99570997\u0027:\n Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n" }, { "commit": "c174288d345d4a80b326b12ff4c10a6c99570997", "tree": "75f52ce293fbace9b41212f50f95e21c6e09269b", "parents": [ "301b1facb23d148efebd7a2aa5c174cd7c04cc6f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Dec 09 11:26:11 2013 -0800" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jan 13 17:10:03 2014 -0800" }, "message": "Fix issue #12031685: Sticky Service Breakage in Android 4.4.1\n\nGot a little too aggressive about cleaning up service state; need to\navoid removing services from an app until we are in the second loop\ndoing the final cleanup, otherwise we can leave services around with\nrestarting their process.\n\nAlso fix crash:\n\nW/BinderNative( 667): Uncaught exception from death notification\nW/BinderNative( 667): java.lang.ArrayIndexOutOfBoundsException: length\u003d0; index\u003d0\nW/BinderNative( 667): \tat android.util.ArraySet.valueAt(ArraySet.java:301)\nW/BinderNative( 667): \tat com.android.server.am.ActiveServices.killServicesLocked(ActiveServices.java:2069)\nW/BinderNative( 667): \tat com.android.server.am.ActivityManagerService.cleanUpApplicationRecordLocked(ActivityManagerService.java:12412)\nW/BinderNative( 667): \tat com.android.server.am.ActivityManagerService.handleAppDiedLocked(ActivityManagerService.java:3596)\nW/BinderNative( 667): \tat com.android.server.am.ActivityManagerService.appDiedLocked(ActivityManagerService.java:3744)\nW/BinderNative( 667): \tat com.android.server.am.ActivityManagerService$AppDeathRecipient.binderDied(ActivityManagerService.java:1024)\nW/BinderNative( 667): \tat android.os.BinderProxy.sendDeathNotice(Binder.java:493)\nW/BinderNative( 667): \tat dalvik.system.NativeStart.run(Native Method)\n" }, { "commit": "595ddb89118a33743a05d20bc6c70f8b7a10406d", "tree": "06e1fb38fd4b3ec0a5e58a012f34e0751958f5ca", "parents": [ "15de74b64b08c5f6d17c1a4c1d225dca70064f71", "03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Tue Jan 14 00:30:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 00:30:18 2014 +0000" }, "message": "am 03d65b4b: am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge \"docs: Fixed typo.\" into klp-docs\n\n* commit \u002703d65b4b8a0893d57c5bb00f7f8d02a7869ff12c\u0027:\n docs: Fixed typo.\n" }, { "commit": "15de74b64b08c5f6d17c1a4c1d225dca70064f71", "tree": "decb8f5afe18820e4abab0901a3349b220adabb7", "parents": [ "5c44c51c2a0b5a2268de07fab6854623188b5a7c", "cfbc332f6f63de09a126b45fa78e093a92eef09e" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Tue Jan 14 00:30:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 00:30:11 2014 +0000" }, "message": "am cfbc332f: am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos.\n\n* commit \u0027cfbc332f6f63de09a126b45fa78e093a92eef09e\u0027:\n docs: Fixed typos.\n" }, { "commit": "03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c", "tree": "833e8908feca074ec24df2031bd87ad9764f6470", "parents": [ "cfbc332f6f63de09a126b45fa78e093a92eef09e", "9865216eb1c747b03cb60245772b196fc039a1b6" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Tue Jan 14 00:26:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 00:26:41 2014 +0000" }, "message": "am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge \"docs: Fixed typo.\" into klp-docs\n\n* commit \u00279865216eb1c747b03cb60245772b196fc039a1b6\u0027:\n docs: Fixed typo.\n" }, { "commit": "cfbc332f6f63de09a126b45fa78e093a92eef09e", "tree": "ae1fa3e0bb5aeec09f64982d540504970defbddb", "parents": [ "cf77c05988dee8410d9235b9818dbcdf01c48f4f", "f4494e6c8f7fc610795337a72d774e0f6cdc94ac" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Tue Jan 14 00:26:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 00:26:36 2014 +0000" }, "message": "am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos.\n\n* commit \u0027f4494e6c8f7fc610795337a72d774e0f6cdc94ac\u0027:\n docs: Fixed typos.\n" }, { "commit": "9865216eb1c747b03cb60245772b196fc039a1b6", "tree": "05cc0a7a0706d5280371895c0c6a7c0018292da7", "parents": [ "f4494e6c8f7fc610795337a72d774e0f6cdc94ac", "18bf3b1df67f219d70e6cba828216a47d92e3dc5" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Mon Jan 13 16:23:24 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 16:23:24 2014 -0800" }, "message": "am 18bf3b1d: am 5e15e1ab: Merge \"docs: Fixed typo.\" into klp-docs\n\n* commit \u002718bf3b1df67f219d70e6cba828216a47d92e3dc5\u0027:\n docs: Fixed typo.\n" }, { "commit": "f4494e6c8f7fc610795337a72d774e0f6cdc94ac", "tree": "2520ec47a7908dd244795a54bb5294df6d32cb42", "parents": [ "c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed", "faca5e3c917a6197b380eb5d2b51893b5d689946" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Mon Jan 13 16:23:19 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 16:23:19 2014 -0800" }, "message": "am faca5e3c: am ac5ad7b9: docs: Fixed typos.\n\n* commit \u0027faca5e3c917a6197b380eb5d2b51893b5d689946\u0027:\n docs: Fixed typos.\n" }, { "commit": "18bf3b1df67f219d70e6cba828216a47d92e3dc5", "tree": "d34d8abd3178271115eb4b5a60cb5a440c7dacca", "parents": [ "faca5e3c917a6197b380eb5d2b51893b5d689946", "5e15e1abe8a14f95ab40cf8181ac2a4f8b5d76e2" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Tue Jan 14 00:19:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 00:19:55 2014 +0000" }, "message": "am 5e15e1ab: Merge \"docs: Fixed typo.\" into klp-docs\n\n* commit \u00275e15e1abe8a14f95ab40cf8181ac2a4f8b5d76e2\u0027:\n docs: Fixed typo.\n" }, { "commit": "faca5e3c917a6197b380eb5d2b51893b5d689946", "tree": "b57c4b71ea770ada5da2f1faf687f2bf666a9d82", "parents": [ "d8dfa528b86e734318159b6fa75814184fb02c9d", "ac5ad7b9e488a967ffee56fd1b168c010c1d62e8" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Tue Jan 14 00:19:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 14 00:19:51 2014 +0000" }, "message": "am ac5ad7b9: docs: Fixed typos.\n\n* commit \u0027ac5ad7b9e488a967ffee56fd1b168c010c1d62e8\u0027:\n docs: Fixed typos.\n" }, { "commit": "5e15e1abe8a14f95ab40cf8181ac2a4f8b5d76e2", "tree": "09ca7b4a94abcedc087db7f1e0fa720a071cd466", "parents": [ "ac5ad7b9e488a967ffee56fd1b168c010c1d62e8", "8386e4aef972d099d7187e6c8e560edaac06008d" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Tue Jan 14 00:18:23 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 14 00:18:23 2014 +0000" }, "message": "Merge \"docs: Fixed typo.\" into klp-docs" }, { "commit": "ac5ad7b9e488a967ffee56fd1b168c010c1d62e8", "tree": "7eb9b4d267092e721f8f9df79f7bc10c3122cb93", "parents": [ "ccc5ca144c2d6e21df5118870d0a3f3c65055686" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Mon Jan 13 13:48:45 2014 -0800" }, "committer": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Mon Jan 13 16:02:28 2014 -0800" }, "message": "docs: Fixed typos.\n\nbug:10732654\nChange-Id: I5a580cf40e2670485f9c57e2376efd20bcf7b60d\n\nReview URL: http://quixote.mtv.corp.google.com:8002/training/articles/security-tips.html\n" }, { "commit": "5c44c51c2a0b5a2268de07fab6854623188b5a7c", "tree": "94c97d17e4d9d1d82f87c81980edd7ac89d35a34", "parents": [ "cd655f12e730a76e2a97ce6af775b852adc493ce", "529cbcd0af105aeda46759f92e2b0d1d469554f0" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Jan 14 00:00:00 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 14 00:00:00 2014 +0000" }, "message": "Merge \"Use new DisplayManager flag to show own content only.\" into klp-modular-dev" }, { "commit": "8386e4aef972d099d7187e6c8e560edaac06008d", "tree": "e1c02eb7bfe67133804be6645e24ffe92faf3eaf", "parents": [ "ccc5ca144c2d6e21df5118870d0a3f3c65055686" ], "author": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Mon Jan 13 13:27:47 2014 -0800" }, "committer": { "name": "Ricardo Cervera", "email": "rcervera@google.com", "time": "Mon Jan 13 15:46:06 2014 -0800" }, "message": "docs: Fixed typo.\n\nbug:10797855\nChange-Id: I2fdfa02046827a51eb7263e1892a04acfd4f0453\n\nReview fix URL:\nhttp://quixote.mtv.corp.google.com:8001/distribute/index.html\n" }, { "commit": "cd655f12e730a76e2a97ce6af775b852adc493ce", "tree": "c5b64b2520b7cea9b50c22d7cf35bae56cdede25", "parents": [ "e769a0406997e2ec33b0b979f3ccec85c18bb3ef", "fb5fceaedc7964cc02a08fd93ac62ece7f33059d" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Mon Jan 13 22:25:03 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jan 13 22:25:03 2014 +0000" }, "message": "Merge \"Fix broken homekey on devices without keyguard\" into klp-modular-dev" }, { "commit": "e769a0406997e2ec33b0b979f3ccec85c18bb3ef", "tree": "7825b581f0c34f07f89f566e3c341ca5c01ab2e3", "parents": [ "71007e5d549ba72f68d9ee054cffb477205d3ac5", "cf77c05988dee8410d9235b9818dbcdf01c48f4f" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 21:10:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 21:10:05 2014 +0000" }, "message": "am cf77c059: am c809bd8b: am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027cf77c05988dee8410d9235b9818dbcdf01c48f4f\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "cf77c05988dee8410d9235b9818dbcdf01c48f4f", "tree": "32a7e05798b78d688ddf325afcde5a897861b003", "parents": [ "555b8ebfd6e4ee1f60752459061f6dae2fd45981", "c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 21:06:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 21:06:24 2014 +0000" }, "message": "am c809bd8b: am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed", "tree": "1a7bc5487c8f5c297918e2825a3ab8718cd4832a", "parents": [ "e29ff50aae302ef05b0592e4bab6b3090a59254a", "d8dfa528b86e734318159b6fa75814184fb02c9d" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 13:03:33 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 13:03:33 2014 -0800" }, "message": "am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027d8dfa528b86e734318159b6fa75814184fb02c9d\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "d8dfa528b86e734318159b6fa75814184fb02c9d", "tree": "f1975ecab03f54463ed3e51a63b4539b88cb54d1", "parents": [ "fe7bfdd384f199668ba9b1b751194e06cbb50b3b", "301b1facb23d148efebd7a2aa5c174cd7c04cc6f" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:59:20 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:59:20 2014 -0800" }, "message": "am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027301b1facb23d148efebd7a2aa5c174cd7c04cc6f\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "301b1facb23d148efebd7a2aa5c174cd7c04cc6f", "tree": "699d0da078d64ebcbc98ed3c789e9f558f9b0068", "parents": [ "af2f2f767a1673f10a2b44f913832cacefda341b", "26c6c15f54231c154bb2f7febb053d034cbe40c5" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:56:27 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:56:27 2014 -0800" }, "message": "am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u002726c6c15f54231c154bb2f7febb053d034cbe40c5\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "529cbcd0af105aeda46759f92e2b0d1d469554f0", "tree": "fcc978f55bde62b5cf53dc690690e9a7e2b99ee7", "parents": [ "4504de5d5a8e1c7dfb306b16282f348856c24764" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jan 13 12:55:33 2014 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jan 13 12:55:33 2014 -0800" }, "message": "Use new DisplayManager flag to show own content only.\n\nChange-Id: I8b2666e5849e57b5eb2ed73ed3d5e39da2dbd55d\n" }, { "commit": "26c6c15f54231c154bb2f7febb053d034cbe40c5", "tree": "c0ad8e798c5a141b65117c639fb1fda87522affd", "parents": [ "9ecadd7cedc492faef163a314713caddbd5da39a", "b3c96c4c57cb97924f828ea917b1c4d63b2c9d00" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:53:27 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:53:27 2014 -0800" }, "message": "am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027b3c96c4c57cb97924f828ea917b1c4d63b2c9d00\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "b3c96c4c57cb97924f828ea917b1c4d63b2c9d00", "tree": "d4c7d3994939e298920a9cb4a43adc63230619dc", "parents": [ "6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8", "1d151607fbee65fc9fc2bb1cb38a850c1f68bede" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:50:18 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:50:18 2014 -0800" }, "message": "am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u00271d151607fbee65fc9fc2bb1cb38a850c1f68bede\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "1d151607fbee65fc9fc2bb1cb38a850c1f68bede", "tree": "767d4e75392eb711397e4862c3c5b3d3c646a42b", "parents": [ "3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d", "4013c4b18ccc66b510f4cdb222d4c04597975843" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:46:35 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:46:35 2014 -0800" }, "message": "am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u00274013c4b18ccc66b510f4cdb222d4c04597975843\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "4013c4b18ccc66b510f4cdb222d4c04597975843", "tree": "eb6e25c9f2b750a74715e211a9d27ff9c0e38e72", "parents": [ "ea47cb6763d36fcc916c63dd764b48b4b6f1ff01", "42d7a0bff5da6aeb8323ae0c797e9c4e116b637b" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:43:47 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:43:47 2014 -0800" }, "message": "am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u002742d7a0bff5da6aeb8323ae0c797e9c4e116b637b\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "42d7a0bff5da6aeb8323ae0c797e9c4e116b637b", "tree": "08056689b831a0a0c85cd14babbb7f13cff1c863", "parents": [ "bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f", "a7d13fabd6184e411215e9a841cf16097f1a5127" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:41:48 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:41:48 2014 -0800" }, "message": "am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027a7d13fabd6184e411215e9a841cf16097f1a5127\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "a7d13fabd6184e411215e9a841cf16097f1a5127", "tree": "976c9030c511288b3adfa6e742e516e8ccf4c0e7", "parents": [ "5716e4bfb980c8bab01b51944c1e715d76d59b1d", "45aaa377c5d090003c6cf5fb54fff856a0807c4f" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:40:04 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:40:04 2014 -0800" }, "message": "am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u002745aaa377c5d090003c6cf5fb54fff856a0807c4f\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "45aaa377c5d090003c6cf5fb54fff856a0807c4f", "tree": "88932fed46ea0ca54dc3e2b030d4435a1317801e", "parents": [ "776b3956a9742b868b037dffd2b24c17b2dfa0e6", "a1b89310d58df14570f7f6f5abb677c976c63a7a" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:36:49 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:36:49 2014 -0800" }, "message": "am a1b89310: am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027a1b89310d58df14570f7f6f5abb677c976c63a7a\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "a1b89310d58df14570f7f6f5abb677c976c63a7a", "tree": "88932fed46ea0ca54dc3e2b030d4435a1317801e", "parents": [ "7f4d82932c812fbac1d99ceaf9462b7a763f5231", "a87bdc1f8ff308f90ec7a3234c4848c79d4c3988" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Mon Jan 13 12:33:39 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 12:33:39 2014 -0800" }, "message": "am a87bdc1f: Merge commit \\\u0027bc39746e\\\u0027 into manualmerge\n\n* commit \u0027a87bdc1f8ff308f90ec7a3234c4848c79d4c3988\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "71007e5d549ba72f68d9ee054cffb477205d3ac5", "tree": "7825b581f0c34f07f89f566e3c341ca5c01ab2e3", "parents": [ "94827c3484da6f0a9cd171e6892d2710b1eafa12", "555b8ebfd6e4ee1f60752459061f6dae2fd45981" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 19:10:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 19:10:08 2014 +0000" }, "message": "am 555b8ebf: am e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev\n\n* commit \u0027555b8ebfd6e4ee1f60752459061f6dae2fd45981\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "555b8ebfd6e4ee1f60752459061f6dae2fd45981", "tree": "32a7e05798b78d688ddf325afcde5a897861b003", "parents": [ "21a801d0885d65f128b84a593140b07fd0d4e980", "e29ff50aae302ef05b0592e4bab6b3090a59254a" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 19:05:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 19:05:49 2014 +0000" }, "message": "am e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev\n\n* commit \u0027e29ff50aae302ef05b0592e4bab6b3090a59254a\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "e29ff50aae302ef05b0592e4bab6b3090a59254a", "tree": "1a7bc5487c8f5c297918e2825a3ab8718cd4832a", "parents": [ "0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2", "fe7bfdd384f199668ba9b1b751194e06cbb50b3b" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 11:02:15 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 11:02:15 2014 -0800" }, "message": "am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev\n\n* commit \u0027fe7bfdd384f199668ba9b1b751194e06cbb50b3b\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "94827c3484da6f0a9cd171e6892d2710b1eafa12", "tree": "7825b581f0c34f07f89f566e3c341ca5c01ab2e3", "parents": [ "38c65b1f70042bc8e37e91106692158f0ce98703", "21a801d0885d65f128b84a593140b07fd0d4e980" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 19:00:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 19:00:37 2014 +0000" }, "message": "am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into klp-dev\n\n* commit \u002721a801d0885d65f128b84a593140b07fd0d4e980\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "fe7bfdd384f199668ba9b1b751194e06cbb50b3b", "tree": "f1975ecab03f54463ed3e51a63b4539b88cb54d1", "parents": [ "3d5ea26fbb92b1b780cd9763c0731288f48341a3", "af2f2f767a1673f10a2b44f913832cacefda341b" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 11:00:02 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 11:00:02 2014 -0800" }, "message": "am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev\n\n* commit \u0027af2f2f767a1673f10a2b44f913832cacefda341b\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "21a801d0885d65f128b84a593140b07fd0d4e980", "tree": "32a7e05798b78d688ddf325afcde5a897861b003", "parents": [ "6fba240b72e9ae2bc66c98b058e78aecd568ae3f", "0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 18:57:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 18:57:19 2014 +0000" }, "message": "am 0d30e07d: am 3d5ea26f: am 4503409a: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into klp-dev\n\n* commit \u00270d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "af2f2f767a1673f10a2b44f913832cacefda341b", "tree": "699d0da078d64ebcbc98ed3c789e9f558f9b0068", "parents": [ "4503409a477f3fca2eb60e4105d804069d7b0cad", "9ecadd7cedc492faef163a314713caddbd5da39a" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 10:56:41 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 10:56:41 2014 -0800" }, "message": "am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev\n\n* commit \u00279ecadd7cedc492faef163a314713caddbd5da39a\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "9ecadd7cedc492faef163a314713caddbd5da39a", "tree": "c0ad8e798c5a141b65117c639fb1fda87522affd", "parents": [ "c454bbe805bd6ed096ec6b4b811c4e4b67a86225", "6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 10:53:31 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 10:53:31 2014 -0800" }, "message": "am 6f34b938: am 3238d0d9: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev\n\n* commit \u00276f34b9382f0dac64952e0e5c05e96ea2ef3e28e8\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2", "tree": "1a7bc5487c8f5c297918e2825a3ab8718cd4832a", "parents": [ "6d3700b394c7137ef95580d35223a402a3dd0e7c", "3d5ea26fbb92b1b780cd9763c0731288f48341a3" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 10:52:54 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 10:52:54 2014 -0800" }, "message": "am 3d5ea26f: am 4503409a: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into klp-dev\n\n* commit \u00273d5ea26fbb92b1b780cd9763c0731288f48341a3\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8", "tree": "d4c7d3994939e298920a9cb4a43adc63230619dc", "parents": [ "b15429a6853472207c2a4aefd22dd009e851edb7", "3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 10:50:03 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 10:50:03 2014 -0800" }, "message": "am 3238d0d9: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev\n\n* commit \u00273238d0d9f98d4d0972e52a81a4e9b8d2aea0436d\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "3d5ea26fbb92b1b780cd9763c0731288f48341a3", "tree": "f1975ecab03f54463ed3e51a63b4539b88cb54d1", "parents": [ "d8849489a79a6b46996f3192b92d5089521e9341", "4503409a477f3fca2eb60e4105d804069d7b0cad" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 10:49:40 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 10:49:40 2014 -0800" }, "message": "am 4503409a: Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into klp-dev\n\n* commit \u00274503409a477f3fca2eb60e4105d804069d7b0cad\u0027:\n Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "38c65b1f70042bc8e37e91106692158f0ce98703", "tree": "c2cefd3968df5994342208335fd637e72e73dc8e", "parents": [ "909427d093c30d2d4f4ffe5da19f1db6c3e9a3b3", "6fba240b72e9ae2bc66c98b058e78aecd568ae3f" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jan 13 18:47:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 18:47:41 2014 +0000" }, "message": "am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge \"MountService listeners can not be unregistered\"\n\n* commit \u00276fba240b72e9ae2bc66c98b058e78aecd568ae3f\u0027:\n MountService listeners can not be unregistered\n" }, { "commit": "3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d", "tree": "767d4e75392eb711397e4862c3c5b3d3c646a42b", "parents": [ "503c5a32a4e718282b88f73e602c09e1bda49aec", "766b5c4342898054ad2036764d811057812cc562" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 18:44:45 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jan 13 18:44:45 2014 +0000" }, "message": "Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into jb-mr2-dev" }, { "commit": "6fba240b72e9ae2bc66c98b058e78aecd568ae3f", "tree": "aca072886c118de7763dddc48317c95590724575", "parents": [ "f588d2dff2ca6000fe02c5ac6e85f97133477767", "6d3700b394c7137ef95580d35223a402a3dd0e7c" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jan 13 18:44:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 18:44:43 2014 +0000" }, "message": "am 6d3700b3: am 47235e8b: am 90cadb35: Merge \"MountService listeners can not be unregistered\"\n\n* commit \u00276d3700b394c7137ef95580d35223a402a3dd0e7c\u0027:\n MountService listeners can not be unregistered\n" }, { "commit": "4503409a477f3fca2eb60e4105d804069d7b0cad", "tree": "699d0da078d64ebcbc98ed3c789e9f558f9b0068", "parents": [ "a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c", "75c55f92f5ca00ced05b6778389454ae50beed61" ], "author": { "name": "Daniel Cashman", "email": "dcashman@google.com", "time": "Mon Jan 13 18:44:37 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jan 13 18:44:38 2014 +0000" }, "message": "Merge \"Clear cached locations when location providers disabled Bug: 12118307\" into klp-dev" }, { "commit": "6d3700b394c7137ef95580d35223a402a3dd0e7c", "tree": "be84be2733815819ed7e29cd273989a111fb7475", "parents": [ "d0ec6d8c505142a51a6c1bfb3637d4a49aa05f32", "47235e8b5ce6c622a1182933404cf5a17fcd35dc" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jan 13 10:42:07 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 10:42:07 2014 -0800" }, "message": "am 47235e8b: am 90cadb35: Merge \"MountService listeners can not be unregistered\"\n\n* commit \u002747235e8b5ce6c622a1182933404cf5a17fcd35dc\u0027:\n MountService listeners can not be unregistered\n" }, { "commit": "47235e8b5ce6c622a1182933404cf5a17fcd35dc", "tree": "8db7f8ee490afb255539ebbaff3756a662362100", "parents": [ "bc2a449a615b30efb81a1a0082a1bb0db515d0f5", "90cadb35156829ff1d6b7066409596da38fc70e1" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jan 13 10:37:51 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 10:37:51 2014 -0800" }, "message": "am 90cadb35: Merge \"MountService listeners can not be unregistered\"\n\n* commit \u002790cadb35156829ff1d6b7066409596da38fc70e1\u0027:\n MountService listeners can not be unregistered\n" }, { "commit": "90cadb35156829ff1d6b7066409596da38fc70e1", "tree": "8543d4bf21ca607352aba39f0d3ee724cb4b154b", "parents": [ "cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f", "d64fe0f53c8f77a32cb7745a0a1c4309f9d0ba8d" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jan 13 18:35:31 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 13 18:35:32 2014 +0000" }, "message": "Merge \"MountService listeners can not be unregistered\"" }, { "commit": "909427d093c30d2d4f4ffe5da19f1db6c3e9a3b3", "tree": "8fed31882e43c7d616257d49afe63e6aa63f6e29", "parents": [ "cf6e0d686f42036992bdac4f47d37bc8c0775027", "f588d2dff2ca6000fe02c5ac6e85f97133477767" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 13 13:07:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 13:07:47 2014 +0000" }, "message": "am f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge \"Fix preference puts with \"null\" values.\"\n\n* commit \u0027f588d2dff2ca6000fe02c5ac6e85f97133477767\u0027:\n Fix preference puts with \"null\" values.\n" }, { "commit": "f588d2dff2ca6000fe02c5ac6e85f97133477767", "tree": "21913ad7fa7f7a8219eea3a131304e00aa1b236d", "parents": [ "1ae176335548f0273e040b6ac0c34e2274789b88", "d0ec6d8c505142a51a6c1bfb3637d4a49aa05f32" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 13 13:04:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 13:04:28 2014 +0000" }, "message": "am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge \"Fix preference puts with \"null\" values.\"\n\n* commit \u0027d0ec6d8c505142a51a6c1bfb3637d4a49aa05f32\u0027:\n Fix preference puts with \"null\" values.\n" }, { "commit": "d0ec6d8c505142a51a6c1bfb3637d4a49aa05f32", "tree": "7d9094514e09b2c22203adcf3a7ac34d4c54db4a", "parents": [ "411350dd234dcf246adf884b66751ac1def64cc0", "bc2a449a615b30efb81a1a0082a1bb0db515d0f5" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 13 05:01:44 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 05:01:44 2014 -0800" }, "message": "am bc2a449a: am cb4d3ec1: Merge \"Fix preference puts with \"null\" values.\"\n\n* commit \u0027bc2a449a615b30efb81a1a0082a1bb0db515d0f5\u0027:\n Fix preference puts with \"null\" values.\n" }, { "commit": "bc2a449a615b30efb81a1a0082a1bb0db515d0f5", "tree": "57628b406c56ec0edad84110b519c3463aad87e9", "parents": [ "739ae9b3b77458b4c77f799cba56dc68d65ab424", "cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 13 04:32:19 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 13 04:32:19 2014 -0800" }, "message": "am cb4d3ec1: Merge \"Fix preference puts with \"null\" values.\"\n\n* commit \u0027cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f\u0027:\n Fix preference puts with \"null\" values.\n" }, { "commit": "cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f", "tree": "565b7dfd371971c80337630c9291bbbf32c9df34", "parents": [ "868173a53f0d1059408b049f30af3402d5b0de64", "c6f429007c2c402be71f69693cb1d2e6a1c8d0cf" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 13 12:29:41 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 13 12:29:41 2014 +0000" }, "message": "Merge \"Fix preference puts with \"null\" values.\"" }, { "commit": "cf6e0d686f42036992bdac4f47d37bc8c0775027", "tree": "e015d7fa5a19f20f4aee8b7ca5c7b7b2b48924c7", "parents": [ "bb0a4f20502c27a920b7d874c9a17c178afee5f9", "ad25fa36cb63f134acf636d70696bbf81548802e" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jan 13 05:33:51 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jan 13 05:33:51 2014 +0000" }, "message": "Merge \"Add display synchronously.\" into klp-modular-dev" }, { "commit": "ad25fa36cb63f134acf636d70696bbf81548802e", "tree": "9f5580059d9b13e2c3f39f822e68652c9504c24b", "parents": [ "4504de5d5a8e1c7dfb306b16282f348856c24764" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Sun Jan 12 21:19:06 2014 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Sun Jan 12 21:26:09 2014 -0800" }, "message": "Add display synchronously.\n\nAdding the virtual display to window manager through a handler message\ncauses timing issues. Add the display directly to fix it.\n\nChange-Id: I3ad6b16ce6dff2a48abd120a8e873e11a028e2c3\n" }, { "commit": "fb5fceaedc7964cc02a08fd93ac62ece7f33059d", "tree": "239f258e78fe20d0649d3121284b595fcda138fb", "parents": [ "bb0a4f20502c27a920b7d874c9a17c178afee5f9" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Wed Jan 08 14:57:54 2014 -0800" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sat Jan 11 02:33:04 2014 +0000" }, "message": "Fix broken homekey on devices without keyguard\n\nFixes bug 12447288\n\nChange-Id: I580dbeac03b56c01d33844f094eaac20d7aba119" }, { "commit": "bb0a4f20502c27a920b7d874c9a17c178afee5f9", "tree": "0f4d6aa5e74fef94fcb244d9e3b528ff42667d3d", "parents": [ "da9b87a70994ed00868dd4405243932fe7e267f2", "1ae176335548f0273e040b6ac0c34e2274789b88" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Sat Jan 11 00:57:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 11 00:57:22 2014 +0000" }, "message": "am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge \"Fix a JNI local reference leak in MediaDrm\"\n\n* commit \u00271ae176335548f0273e040b6ac0c34e2274789b88\u0027:\n Fix a JNI local reference leak in MediaDrm\n" }, { "commit": "1ae176335548f0273e040b6ac0c34e2274789b88", "tree": "dcb5a2341975a422ee2832ff01c6d5a4d707b8e9", "parents": [ "5d8936b4cfdb14941536e533c2cc376e99b9f7d5", "411350dd234dcf246adf884b66751ac1def64cc0" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Sat Jan 11 00:54:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 11 00:54:18 2014 +0000" }, "message": "am 411350dd: am 739ae9b3: am 868173a5: Merge \"Fix a JNI local reference leak in MediaDrm\"\n\n* commit \u0027411350dd234dcf246adf884b66751ac1def64cc0\u0027:\n Fix a JNI local reference leak in MediaDrm\n" }, { "commit": "411350dd234dcf246adf884b66751ac1def64cc0", "tree": "ab781ad1de02c4a783b32bdf4932facf3aca713f", "parents": [ "275817929a584b220a54b5c8206c7a7425da16d4", "739ae9b3b77458b4c77f799cba56dc68d65ab424" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Fri Jan 10 16:50:54 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 16:50:54 2014 -0800" }, "message": "am 739ae9b3: am 868173a5: Merge \"Fix a JNI local reference leak in MediaDrm\"\n\n* commit \u0027739ae9b3b77458b4c77f799cba56dc68d65ab424\u0027:\n Fix a JNI local reference leak in MediaDrm\n" }, { "commit": "739ae9b3b77458b4c77f799cba56dc68d65ab424", "tree": "54ee1416cec83dce877132c438fd3a7282c55932", "parents": [ "54f991375a9c7c2a256e6aec7d4a223be8d36b39", "868173a53f0d1059408b049f30af3402d5b0de64" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Fri Jan 10 16:48:12 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 16:48:12 2014 -0800" }, "message": "am 868173a5: Merge \"Fix a JNI local reference leak in MediaDrm\"\n\n* commit \u0027868173a53f0d1059408b049f30af3402d5b0de64\u0027:\n Fix a JNI local reference leak in MediaDrm\n" }, { "commit": "868173a53f0d1059408b049f30af3402d5b0de64", "tree": "7f3541cf788ce57228ab1c9968f86e55f685a2cb", "parents": [ "3747768bde14ff9db96279830f07602ec50544cc", "265551a164ac7757d1f2dacc0e2ab0afa0f850c7" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Sat Jan 11 00:42:19 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Jan 11 00:42:20 2014 +0000" }, "message": "Merge \"Fix a JNI local reference leak in MediaDrm\"" }, { "commit": "da9b87a70994ed00868dd4405243932fe7e267f2", "tree": "ce0598a176828413a2e63a32dda5613e0e6f7a1a", "parents": [ "214f4a56425142fb94f3f542f8c08a76cf846571", "5d8936b4cfdb14941536e533c2cc376e99b9f7d5" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Sat Jan 11 00:09:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 11 00:09:22 2014 +0000" }, "message": "am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge \"Fix visibility of multiple non-fullscreen activities.\"\n\n* commit \u00275d8936b4cfdb14941536e533c2cc376e99b9f7d5\u0027:\n Fix visibility of multiple non-fullscreen activities.\n" }, { "commit": "5d8936b4cfdb14941536e533c2cc376e99b9f7d5", "tree": "b8c03cb1be64ae83d0ad619debeead89abda3c15", "parents": [ "cc33c350df41ac0b3f08dcef287edd5406cdad85", "275817929a584b220a54b5c8206c7a7425da16d4" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Sat Jan 11 00:05:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 11 00:05:55 2014 +0000" }, "message": "am 27581792: am 54f99137: am 3747768b: Merge \"Fix visibility of multiple non-fullscreen activities.\"\n\n* commit \u0027275817929a584b220a54b5c8206c7a7425da16d4\u0027:\n Fix visibility of multiple non-fullscreen activities.\n" }, { "commit": "275817929a584b220a54b5c8206c7a7425da16d4", "tree": "2c4ca70ebe4bab392136533d09489b17bae4a335", "parents": [ "d45a76db36854b4dc58f7c717f557311a9603f7a", "54f991375a9c7c2a256e6aec7d4a223be8d36b39" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 16:03:06 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 16:03:06 2014 -0800" }, "message": "am 54f99137: am 3747768b: Merge \"Fix visibility of multiple non-fullscreen activities.\"\n\n* commit \u002754f991375a9c7c2a256e6aec7d4a223be8d36b39\u0027:\n Fix visibility of multiple non-fullscreen activities.\n" }, { "commit": "54f991375a9c7c2a256e6aec7d4a223be8d36b39", "tree": "0af9bb7d1871feb9ca20373865221456e9942ade", "parents": [ "5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d", "3747768bde14ff9db96279830f07602ec50544cc" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 15:59:59 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 15:59:59 2014 -0800" }, "message": "am 3747768b: Merge \"Fix visibility of multiple non-fullscreen activities.\"\n\n* commit \u00273747768bde14ff9db96279830f07602ec50544cc\u0027:\n Fix visibility of multiple non-fullscreen activities.\n" }, { "commit": "3747768bde14ff9db96279830f07602ec50544cc", "tree": "f85ff53d2a16c8aa895f0180490d13fa5c42116a", "parents": [ "35b7de4c4562db8af697ad3384c09d2258d183ba", "446ef1de8d373c1b017df8d19ebf9a47811fb402" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 23:55:43 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 10 23:55:44 2014 +0000" }, "message": "Merge \"Fix visibility of multiple non-fullscreen activities.\"" }, { "commit": "214f4a56425142fb94f3f542f8c08a76cf846571", "tree": "fe3e7a5883fb3734e239eec0a2ff389934faa2a2", "parents": [ "d7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2", "cc33c350df41ac0b3f08dcef287edd5406cdad85" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Jan 10 23:18:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 23:18:09 2014 +0000" }, "message": "am cc33c350: am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update.\n\n* commit \u0027cc33c350df41ac0b3f08dcef287edd5406cdad85\u0027:\n Doc change: dashboard update.\n" }, { "commit": "cc33c350df41ac0b3f08dcef287edd5406cdad85", "tree": "16b3d1ecd2d4995fcf0de094ec3c9a2aa1023396", "parents": [ "881e1fe733744d2f3fe5d26e9612b36eb791757e", "d45a76db36854b4dc58f7c717f557311a9603f7a" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Jan 10 23:15:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 23:15:13 2014 +0000" }, "message": "am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update.\n\n* commit \u0027d45a76db36854b4dc58f7c717f557311a9603f7a\u0027:\n Doc change: dashboard update.\n" }, { "commit": "d45a76db36854b4dc58f7c717f557311a9603f7a", "tree": "05ce9c57bae87b7adee4b3d53e08bb4d28b1d87a", "parents": [ "dc622f5e117031b494de750ab7729b07aa787243", "d8849489a79a6b46996f3192b92d5089521e9341" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Jan 10 15:09:33 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 15:09:33 2014 -0800" }, "message": "am d8849489: am ccc5ca14: Doc change: dashboard update.\n\n* commit \u0027d8849489a79a6b46996f3192b92d5089521e9341\u0027:\n Doc change: dashboard update.\n" }, { "commit": "d7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2", "tree": "0a98220af68171b7b692d0ce6ad16ab596f8d8cd", "parents": [ "797a82b44d94d0cb4b036272dabdb8a18ac17a7e", "330a6bd8a643c33318c751239a092ce393d87b06" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 23:06:50 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 10 23:06:50 2014 +0000" }, "message": "Merge \"Remove misleading warnings.\" into klp-modular-dev" }, { "commit": "d8849489a79a6b46996f3192b92d5089521e9341", "tree": "893700c475a9f20a6148f308a7463bed87d0be87", "parents": [ "36788815be0e9c2d12cdc44d186f0cbe6a9e7122", "ccc5ca144c2d6e21df5118870d0a3f3c65055686" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Jan 10 23:06:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 23:06:16 2014 +0000" }, "message": "am ccc5ca14: Doc change: dashboard update.\n\n* commit \u0027ccc5ca144c2d6e21df5118870d0a3f3c65055686\u0027:\n Doc change: dashboard update.\n" }, { "commit": "330a6bd8a643c33318c751239a092ce393d87b06", "tree": "4cdad3e771d2b09633603c79a4874dc639543015", "parents": [ "4504de5d5a8e1c7dfb306b16282f348856c24764" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 15:05:29 2014 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 15:05:29 2014 -0800" }, "message": "Remove misleading warnings.\n\nError messages that are obsolete and/or incorrect.\n\nFixes bug 12421138.\n\nChange-Id: I43f095048757f7ae9bff47abed594dd34d8387ce\n" }, { "commit": "ccc5ca144c2d6e21df5118870d0a3f3c65055686", "tree": "063006b0c57e2e31dcb5a5bd64adda6895cb1566", "parents": [ "ff65ca29a00aa282160dd8a77cdd6ed6855abba7" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Jan 08 15:52:27 2014 -0800" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Jan 10 15:00:16 2014 -0800" }, "message": "Doc change: dashboard update.\n\nChange-Id: Ic65cd8d6bf2435fa3efd73f3337c462c02a752ed\n" }, { "commit": "797a82b44d94d0cb4b036272dabdb8a18ac17a7e", "tree": "7a98df6bcd92f6358eaa689169f106800a6b0ceb", "parents": [ "93884a5b35ec97a0f44795950363188d9a21137a", "881e1fe733744d2f3fe5d26e9612b36eb791757e" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 21:41:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 21:41:24 2014 +0000" }, "message": "am 881e1fe7: am dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 1211\n\n* commit \u0027881e1fe733744d2f3fe5d26e9612b36eb791757e\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "881e1fe733744d2f3fe5d26e9612b36eb791757e", "tree": "afc1c93dc077ad9a34d51fedc089339c81fba584", "parents": [ "f1fbe1135a2872a7287f5c06af211cf780f16598", "dc622f5e117031b494de750ab7729b07aa787243" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 21:37:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 21:37:40 2014 +0000" }, "message": "am dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027dc622f5e117031b494de750ab7729b07aa787243\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "dc622f5e117031b494de750ab7729b07aa787243", "tree": "1233a3eb520c8bcd1e0045cd84ff2a3c053c26c9", "parents": [ "4ba1bbadb784e365f443b0272b111d384f4f2229", "36788815be0e9c2d12cdc44d186f0cbe6a9e7122" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:34:13 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:34:13 2014 -0800" }, "message": "am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u002736788815be0e9c2d12cdc44d186f0cbe6a9e7122\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "36788815be0e9c2d12cdc44d186f0cbe6a9e7122", "tree": "364939a337beb2e1e060853f7608412346016130", "parents": [ "62bac75d677de5398b48487e758dcbdf7bc9d834", "a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:30:36 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:30:36 2014 -0800" }, "message": "am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "93884a5b35ec97a0f44795950363188d9a21137a", "tree": "7a98df6bcd92f6358eaa689169f106800a6b0ceb", "parents": [ "4504de5d5a8e1c7dfb306b16282f348856c24764" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 13:28:10 2014 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 13:28:10 2014 -0800" }, "message": "Fix invalid stackId bug.\n\nEliminate race condition by executing window manager createStack\ndirectly from activity manager.\n\nChange-Id: I2dda276d07d0ae09c7c958980bc5ebffe72ebd92\n" }, { "commit": "a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c", "tree": "99aaa27a81b2cc0f52f838d71ad16ad0029a566c", "parents": [ "76e5ca81b3ba5a4f52126f2ec8907679b4356292", "c454bbe805bd6ed096ec6b4b811c4e4b67a86225" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:27:26 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:27:26 2014 -0800" }, "message": "am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027c454bbe805bd6ed096ec6b4b811c4e4b67a86225\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "c454bbe805bd6ed096ec6b4b811c4e4b67a86225", "tree": "a24847f553ee76ef8c2e584c972973a67c6a9e91", "parents": [ "5d515f269b155c8e98ef5c0f8057feb41310f80f", "b15429a6853472207c2a4aefd22dd009e851edb7" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:24:05 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:24:05 2014 -0800" }, "message": "am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027b15429a6853472207c2a4aefd22dd009e851edb7\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "b15429a6853472207c2a4aefd22dd009e851edb7", "tree": "c10036aedf1ac06616074f78ad19197d3e3723c5", "parents": [ "fd70624629c42b0e0444a4d99ba64d58551fa6b0", "503c5a32a4e718282b88f73e602c09e1bda49aec" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:18:58 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:18:58 2014 -0800" }, "message": "am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027503c5a32a4e718282b88f73e602c09e1bda49aec\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "a87bdc1f8ff308f90ec7a3234c4848c79d4c3988", "tree": "a210c726c91cf5232bc2911895bf039d1fa94679", "parents": [ "6826387e50f9f272d53ca1f725f573bbddcdf5c1", "bc39746ee9c5962538a96b3edff10e52eb00fc40" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:17:01 2014 -0800" }, "committer": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:17:01 2014 -0800" }, "message": "Merge commit \u0027bc39746e\u0027 into manualmerge\n" }, { "commit": "503c5a32a4e718282b88f73e602c09e1bda49aec", "tree": "117431bfe50021c8a5de4abfc014090f561a12a3", "parents": [ "562fddce2f154f8adec91cc8a4c4ef1fb4eabcfe", "ea47cb6763d36fcc916c63dd764b48b4b6f1ff01" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:14:04 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:14:04 2014 -0800" }, "message": "am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027ea47cb6763d36fcc916c63dd764b48b4b6f1ff01\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "ea47cb6763d36fcc916c63dd764b48b4b6f1ff01", "tree": "eb6e25c9f2b750a74715e211a9d27ff9c0e38e72", "parents": [ "05e3f55f17e36b415a23095dbeaa1d04716aed5a", "bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:10:12 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:10:12 2014 -0800" }, "message": "am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f", "tree": "08056689b831a0a0c85cd14babbb7f13cff1c863", "parents": [ "1d8f592a752c30534a6e03889f1ba42b232770ef", "5716e4bfb980c8bab01b51944c1e715d76d59b1d" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:05:35 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:05:35 2014 -0800" }, "message": "am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u00275716e4bfb980c8bab01b51944c1e715d76d59b1d\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "5716e4bfb980c8bab01b51944c1e715d76d59b1d", "tree": "976c9030c511288b3adfa6e742e516e8ccf4c0e7", "parents": [ "ef12b1d4a9ba6a91b61647feadaf2c4cdf34c356", "776b3956a9742b868b037dffd2b24c17b2dfa0e6" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:02:48 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:02:48 2014 -0800" }, "message": "am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u0027776b3956a9742b868b037dffd2b24c17b2dfa0e6\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "776b3956a9742b868b037dffd2b24c17b2dfa0e6", "tree": "88932fed46ea0ca54dc3e2b030d4435a1317801e", "parents": [ "ea198841a9e64d72de49811e0e2c555eb2c40b9b", "7f4d82932c812fbac1d99ceaf9462b7a763f5231" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 13:00:09 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 13:00:09 2014 -0800" }, "message": "am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u00277f4d82932c812fbac1d99ceaf9462b7a763f5231\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "7f4d82932c812fbac1d99ceaf9462b7a763f5231", "tree": "88932fed46ea0ca54dc3e2b030d4435a1317801e", "parents": [ "ef4694cbdd2e374e063d5d89bcb7c4b041c20a30", "6826387e50f9f272d53ca1f725f573bbddcdf5c1" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 12:55:24 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 12:55:24 2014 -0800" }, "message": "am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u00276826387e50f9f272d53ca1f725f573bbddcdf5c1\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "bc39746ee9c5962538a96b3edff10e52eb00fc40", "tree": "d6fc1954276e2e2dbd80cc2744d1a9e8e0edab3f", "parents": [ "43253333d24e856a7ffef818fdfaedf3fd60d3b6", "8e0c7768c87014fef277df84c737dd6c37fb8866" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Fri Jan 10 12:53:41 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 10 12:53:41 2014 -0800" }, "message": "am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n\n* commit \u00278e0c7768c87014fef277df84c737dd6c37fb8866\u0027:\n DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307\n" }, { "commit": "4504de5d5a8e1c7dfb306b16282f348856c24764", "tree": "37a2024993d2d4baf9db3e19878f5c32fbd92236", "parents": [ "9c9975ac3dc63423751c4783162d4ade11d156c1" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Dec 20 09:06:56 2013 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 10:54:55 2014 -0800" }, "message": "Implement ActivityView.\n\nWith an existing ActivityContainer a caller can now create an\nActivityView which consists of a new VirtualDisplay immediately\nattached to the ActivityContainer.\n\nChange-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364\n" }, { "commit": "9c9975ac3dc63423751c4783162d4ade11d156c1", "tree": "1345ae4dd39a010e7546f1a5deb128f0dd7ae161", "parents": [ "96ada57b2c0c456e9d3a1f43e3ff691f14ec1459", "efc3bb06127a6640afe4985b2b2fc03c5ecc5dee" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri Jan 10 18:30:22 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 10 18:30:23 2014 +0000" }, "message": "Merge \"Fix a bug where OnTouchListeners in action views could be removed\" into klp-modular-dev" }, { "commit": "96ada57b2c0c456e9d3a1f43e3ff691f14ec1459", "tree": "d11314f3deb0e6f5188eb20be2615a3c3d5b1fb6", "parents": [ "0bb2a4deee6451a2f3075254761e9bfb38429fa4", "bd503a4e3a1c897695f0edcf6e4aaac3a7e962c5" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 18:21:49 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 10 18:21:50 2014 +0000" }, "message": "Merge \"Allow for the possibility of null ActivityContainer\" into klp-modular-dev" }, { "commit": "bd503a4e3a1c897695f0edcf6e4aaac3a7e962c5", "tree": "0e6045e9f4770ccb99d7f2efa05bf08dde8e8f9b", "parents": [ "b6d9eb875a0bf1bb655a90c88457689342eb0991" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 10:16:43 2014 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 10:16:43 2014 -0800" }, "message": "Allow for the possibility of null ActivityContainer\n\nWhen BinderProxy is passed in as the IBinder for\ngetEnclosingActivityContainer the activity manager cannot turn it into\nan ActivityRecord. This causes NPE in ActivityThread which is Not Good\n(tm).\n\nAllowing null to be returned when requesting an ActivityContainer and\nhandling it appropriately fixes this bug.\n\nFixes bug 12473669.\n\nChange-Id: I6937636042f8853b3ddc2df40be010e7391e41a5\n" }, { "commit": "efc3bb06127a6640afe4985b2b2fc03c5ecc5dee", "tree": "f0c697716fb9f4d6165ee4f5110484fca8f11f73", "parents": [ "b6d9eb875a0bf1bb655a90c88457689342eb0991" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri Jan 10 10:16:27 2014 -0800" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri Jan 10 10:16:27 2014 -0800" }, "message": "Fix a bug where OnTouchListeners in action views could be removed\n\nActionMenuPresenter should only replace the touch listener when binding\na generated item view.\n\nBug 12470259\n\nChange-Id: I8c4c6110065605225a20cb7ed872255282085661\n" }, { "commit": "0bb2a4deee6451a2f3075254761e9bfb38429fa4", "tree": "494e17ce4f713c1aad149980cc37929d8efd9e37", "parents": [ "22eba28e90e58230cc120bd53faaf223651f9344", "fefeef8249e898d2d450da21d0edda49b88be7ce" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 16:43:18 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 10 16:43:19 2014 +0000" }, "message": "Merge \"Call moveHomeStack before moving any stack.\" into klp-modular-dev" }, { "commit": "fefeef8249e898d2d450da21d0edda49b88be7ce", "tree": "87cd2c37a28bd6987af6e3821678d912b1ef076a", "parents": [ "b6d9eb875a0bf1bb655a90c88457689342eb0991" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 08:40:23 2014 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jan 10 08:40:23 2014 -0800" }, "message": "Call moveHomeStack before moving any stack.\n\nOrder matters, otherwise mFocusedStack and mLastStack aren\u0027t updated\ncorrectly.\n\nFixes bug 12478856.\n\nChange-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2\n" }, { "commit": "22eba28e90e58230cc120bd53faaf223651f9344", "tree": "661428fba5005f379c0075285233fd2131b264b4", "parents": [ "cd6d1f51e20da71d75e8dbf23ba18b371fb3a8ab" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Thu Jan 09 15:38:12 2014 -0800" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Thu Jan 09 15:38:12 2014 -0800" }, "message": "Only compile the services jar and so when using mmm\n\nDon\u0027t build the tests when using \"mmm frameworks/base/services\"\n\nChange-Id: If1895598381bd0fce0b4d7f5e879f154d8fc44d0\n" } ], "next": "cd6d1f51e20da71d75e8dbf23ba18b371fb3a8ab" }