)]}' { "log": [ { "commit": "f69f3737ba8cb2acb481dc78de3c5275bae112e7", "tree": "e74bc72b50200ab15ce1c1514db58da12523165d", "parents": [ "6076ef9355fec90c40d84abaf2c71345f32badfb", "1267462c0bf8ef5a0cfaca535847fc962b2cf32e" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Feb 12 18:56:35 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 18:56:35 2015 +0000" }, "message": "am 1267462c: am f456d4dc: am 20be0e25: Merge \"Update Javadoc for EXTRA_NETWORK.\" into lmp-mr1-dev\n\n* commit \u00271267462c0bf8ef5a0cfaca535847fc962b2cf32e\u0027:\n Update Javadoc for EXTRA_NETWORK.\n" }, { "commit": "1267462c0bf8ef5a0cfaca535847fc962b2cf32e", "tree": "67f5a0a72f7f9dc03f6f2d81b5b3a779fc446cfb", "parents": [ "dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f", "f456d4dcc042581cb2a3ba540538898f2cc925b7" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Feb 12 18:47:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 18:47:14 2015 +0000" }, "message": "am f456d4dc: am 20be0e25: Merge \"Update Javadoc for EXTRA_NETWORK.\" into lmp-mr1-dev\n\n* commit \u0027f456d4dcc042581cb2a3ba540538898f2cc925b7\u0027:\n Update Javadoc for EXTRA_NETWORK.\n" }, { "commit": "f456d4dcc042581cb2a3ba540538898f2cc925b7", "tree": "bec610250d4f166787769aa91174398ba65761f2", "parents": [ "40ab8bb22979b9e7c76e016b861319f6103eb800", "20be0e25ba660a7555577988cefcfa36d84e7e2f" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Feb 12 18:41:17 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 18:41:17 2015 +0000" }, "message": "am 20be0e25: Merge \"Update Javadoc for EXTRA_NETWORK.\" into lmp-mr1-dev\n\n* commit \u002720be0e25ba660a7555577988cefcfa36d84e7e2f\u0027:\n Update Javadoc for EXTRA_NETWORK.\n" }, { "commit": "20be0e25ba660a7555577988cefcfa36d84e7e2f", "tree": "30eda19f6d8794797d4d94f9c579620380c39ef3", "parents": [ "c70d0e71c09da0292958d748cedaa5fbacbec74a", "fcde58f155e8a188078885ec7529a9fe4a67f10e" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Feb 12 18:34:01 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 12 18:34:03 2015 +0000" }, "message": "Merge \"Update Javadoc for EXTRA_NETWORK.\" into lmp-mr1-dev" }, { "commit": "6076ef9355fec90c40d84abaf2c71345f32badfb", "tree": "6dc332db54b853adf04e5fde192e58b8720faafe", "parents": [ "00e821a8608efdc19041bdda1e832d3d4b3c29e2", "dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f" ], "author": { "name": "Benjamin Franz", "email": "bfranz@google.com", "time": "Thu Feb 12 17:02:09 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 17:02:09 2015 +0000" }, "message": "am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.\n\n* commit \u0027dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f\u0027:\n Fix the javadocs for lock task mode intents.\n" }, { "commit": "dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f", "tree": "38416a70be1f4e341ce222c32d7b520cf3815266", "parents": [ "f5d304636d27ea300c092fac0f0214170a89ba39", "40ab8bb22979b9e7c76e016b861319f6103eb800" ], "author": { "name": "Benjamin Franz", "email": "bfranz@google.com", "time": "Thu Feb 12 16:52:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 16:52:34 2015 +0000" }, "message": "am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.\n\n* commit \u002740ab8bb22979b9e7c76e016b861319f6103eb800\u0027:\n Fix the javadocs for lock task mode intents.\n" }, { "commit": "40ab8bb22979b9e7c76e016b861319f6103eb800", "tree": "5f7541912cda7430a7713871a07efbe5066358fe", "parents": [ "4fa3a80b6cefdc500de6c7daacc7ef3e160a0543", "c70d0e71c09da0292958d748cedaa5fbacbec74a" ], "author": { "name": "Benjamin Franz", "email": "bfranz@google.com", "time": "Thu Feb 12 16:45:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 16:45:06 2015 +0000" }, "message": "am c70d0e71: Fix the javadocs for lock task mode intents.\n\n* commit \u0027c70d0e71c09da0292958d748cedaa5fbacbec74a\u0027:\n Fix the javadocs for lock task mode intents.\n" }, { "commit": "00e821a8608efdc19041bdda1e832d3d4b3c29e2", "tree": "45298d3742b66b88a4da1d86e6744a58a30b8b37", "parents": [ "c1a5e82c25dba954cf1c06729e53bfb67667bcbb", "8be3724a06f7b2d28c6664ca11a03f91f97f0972" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Feb 12 16:41:41 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 12 16:41:41 2015 +0000" }, "message": "am c7e48719: Merge \"Remove references to persist.sys.language/country.\"\nautomerge: 8be3724\n\n* commit \u00278be3724a06f7b2d28c6664ca11a03f91f97f0972\u0027:\n Remove references to persist.sys.language/country.\n" }, { "commit": "8be3724a06f7b2d28c6664ca11a03f91f97f0972", "tree": "def2ce6e5ebecc5984d632f5c9a444ff24c70240", "parents": [ "27316a93e5979859ae98f506eca365784353007a", "c7e487193aed3b102d6e55e0817de6e0460e0236" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Feb 12 16:37:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 16:37:58 2015 +0000" }, "message": "am c7e48719: Merge \"Remove references to persist.sys.language/country.\"\n\n* commit \u0027c7e487193aed3b102d6e55e0817de6e0460e0236\u0027:\n Remove references to persist.sys.language/country.\n" }, { "commit": "c7e487193aed3b102d6e55e0817de6e0460e0236", "tree": "def2ce6e5ebecc5984d632f5c9a444ff24c70240", "parents": [ "a8e8cdbb17164c0124e04c376110637af96d5e89", "b61db8229a8f220f23b22b7ccde72e5cf73e0e07" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Feb 12 16:31:07 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 12 16:31:08 2015 +0000" }, "message": "Merge \"Remove references to persist.sys.language/country.\"" }, { "commit": "c70d0e71c09da0292958d748cedaa5fbacbec74a", "tree": "35b6b1fb296af7d79f69fb964f71084ac657807f", "parents": [ "a5f301c7fb048461197a6032f66b35772a3157f9" ], "author": { "name": "Benjamin Franz", "email": "bfranz@google.com", "time": "Thu Feb 12 16:12:58 2015 +0000" }, "committer": { "name": "Benjamin Franz", "email": "bfranz@google.com", "time": "Thu Feb 12 16:12:58 2015 +0000" }, "message": "Fix the javadocs for lock task mode intents.\n\nBug: 19363651\nChange-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd\n" }, { "commit": "b61db8229a8f220f23b22b7ccde72e5cf73e0e07", "tree": "def2ce6e5ebecc5984d632f5c9a444ff24c70240", "parents": [ "a8e8cdbb17164c0124e04c376110637af96d5e89" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Feb 12 12:57:17 2015 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Feb 12 13:16:55 2015 +0000" }, "message": "Remove references to persist.sys.language/country.\n\nAddresses a couple of TODOs now that all usages have been\nremoved and fixes a doc that specifies how the emulator locale\ncan be set.\n\nbug: 17691569\n\nChange-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c\n" }, { "commit": "c1a5e82c25dba954cf1c06729e53bfb67667bcbb", "tree": "51cc67eb0b014b6a42514c1a0516a49b1b48e4a8", "parents": [ "6d8886ac46106bda18b26a0870ed144f225c560f", "27316a93e5979859ae98f506eca365784353007a" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Feb 12 10:00:41 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 12 10:00:41 2015 +0000" }, "message": "Merge \"Remove usages of FloatMath\" automerge: a8e8cdb\nautomerge: 27316a9\n\n* commit \u002727316a93e5979859ae98f506eca365784353007a\u0027:\n Remove usages of FloatMath\n" }, { "commit": "27316a93e5979859ae98f506eca365784353007a", "tree": "b7bd5004de841b02afacf839c71b299e9698527c", "parents": [ "e1e1cd9dfa1dd873c0563321f9dd73703933e578", "a8e8cdbb17164c0124e04c376110637af96d5e89" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Feb 12 09:57:57 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 12 09:57:57 2015 +0000" }, "message": "Merge \"Remove usages of FloatMath\"\nautomerge: a8e8cdb\n\n* commit \u0027a8e8cdbb17164c0124e04c376110637af96d5e89\u0027:\n Remove usages of FloatMath\n" }, { "commit": "a8e8cdbb17164c0124e04c376110637af96d5e89", "tree": "b7bd5004de841b02afacf839c71b299e9698527c", "parents": [ "d884c63c100ecc9e96fa55de5110f7034ba9cc03", "e573aa9371fc507075219cd078117f96ba8b3b02" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Feb 12 09:26:47 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 12 09:26:47 2015 +0000" }, "message": "Merge \"Remove usages of FloatMath\"" }, { "commit": "e573aa9371fc507075219cd078117f96ba8b3b02", "tree": "86ce3ef81c325c40beabe6a069d660169c489c43", "parents": [ "81b8431173837fe9ea21990948d6af30809fb056" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Feb 11 15:49:47 2015 +0000" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Feb 12 09:20:31 2015 +0000" }, "message": "Remove usages of FloatMath\n\nBug: https://code.google.com/p/android/issues/detail?id\u003d36199\nChange-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d\n" }, { "commit": "6d8886ac46106bda18b26a0870ed144f225c560f", "tree": "9b78f91f2d51c0c41def362dafb4d6137eb18fab", "parents": [ "ad5591f819466fc1c87d9ca76be8c06673ccce34", "e1e1cd9dfa1dd873c0563321f9dd73703933e578" ], "author": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Wed Feb 11 22:32:05 2015 -0800" }, "committer": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Wed Feb 11 22:32:05 2015 -0800" }, "message": "resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp\n\nChange-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1\n" }, { "commit": "ad5591f819466fc1c87d9ca76be8c06673ccce34", "tree": "bee8723a33409bd4b99a9b9307410f209f9e2218", "parents": [ "fd90d718f43e676e6487ca089e058cdc5d7f7981", "f5d304636d27ea300c092fac0f0214170a89ba39" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 12 05:54:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 05:54:34 2015 +0000" }, "message": "am f5d30463: am 4fa3a80b: am a5f301c7: Merge \"Legacy: Only set user surface dimensions on output surfaces\" into lmp-mr1-dev\n\n* commit \u0027f5d304636d27ea300c092fac0f0214170a89ba39\u0027:\n Legacy: Only set user surface dimensions on output surfaces\n" }, { "commit": "f5d304636d27ea300c092fac0f0214170a89ba39", "tree": "3ab8d458da3d8e5176e83bf05dde2d744121004d", "parents": [ "b0dfaad8c2a02c33885e6a278c7901da69d8ab49", "4fa3a80b6cefdc500de6c7daacc7ef3e160a0543" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 12 05:48:50 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 05:48:50 2015 +0000" }, "message": "am 4fa3a80b: am a5f301c7: Merge \"Legacy: Only set user surface dimensions on output surfaces\" into lmp-mr1-dev\n\n* commit \u00274fa3a80b6cefdc500de6c7daacc7ef3e160a0543\u0027:\n Legacy: Only set user surface dimensions on output surfaces\n" }, { "commit": "4fa3a80b6cefdc500de6c7daacc7ef3e160a0543", "tree": "144a781de1feb4bb67a5ecd9e1f80545acba0ccb", "parents": [ "f99551d8a149c1a80dddd6350efcfbd53d58e151", "a5f301c7fb048461197a6032f66b35772a3157f9" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 12 05:39:05 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 05:39:05 2015 +0000" }, "message": "am a5f301c7: Merge \"Legacy: Only set user surface dimensions on output surfaces\" into lmp-mr1-dev\n\n* commit \u0027a5f301c7fb048461197a6032f66b35772a3157f9\u0027:\n Legacy: Only set user surface dimensions on output surfaces\n" }, { "commit": "a5f301c7fb048461197a6032f66b35772a3157f9", "tree": "83914d51a56d5fb334ea9347990eea5e82537a51", "parents": [ "c7ccc393b470220710f566d447412d93f7f8d21b", "b0acf7fcfab08b5af1f99daa51bedbb659d18926" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 12 05:33:27 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 12 05:33:28 2015 +0000" }, "message": "Merge \"Legacy: Only set user surface dimensions on output surfaces\" into lmp-mr1-dev" }, { "commit": "e1e1cd9dfa1dd873c0563321f9dd73703933e578", "tree": "d86587257845856a5ac2a1a6b4b06b775ad0693c", "parents": [ "517e0274cb2cfd215b20622280d5e256e8282bbb", "d884c63c100ecc9e96fa55de5110f7034ba9cc03" ], "author": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Thu Feb 12 04:39:01 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 04:39:01 2015 +0000" }, "message": "am d884c63c: Merge \"Use ICU for relative time formatting\"\n\n* commit \u0027d884c63c100ecc9e96fa55de5110f7034ba9cc03\u0027:\n Use ICU for relative time formatting\n" }, { "commit": "d884c63c100ecc9e96fa55de5110f7034ba9cc03", "tree": "d86587257845856a5ac2a1a6b4b06b775ad0693c", "parents": [ "1a24bb597aeb1b019d55988b574e5db1b0e4232c", "67bfa0b083ef0eef49b29b461afa65e5384ec429" ], "author": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Thu Feb 12 04:30:43 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 12 04:30:43 2015 +0000" }, "message": "Merge \"Use ICU for relative time formatting\"" }, { "commit": "fd90d718f43e676e6487ca089e058cdc5d7f7981", "tree": "280b919b4a0329a0e7867ced9862a16c1df187fc", "parents": [ "bee1def31bb7a3a22e7c83904a3d8c418eeb5e48", "b0dfaad8c2a02c33885e6a278c7901da69d8ab49" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Feb 12 03:09:57 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 03:09:57 2015 +0000" }, "message": "am b0dfaad8: am f99551d8: am c7ccc393: Merge \"Make reportInetCondition revalidate if the report differs from our state\" into lmp-mr1-dev\n\n* commit \u0027b0dfaad8c2a02c33885e6a278c7901da69d8ab49\u0027:\n Make reportInetCondition revalidate if the report differs from our state\n" }, { "commit": "b0dfaad8c2a02c33885e6a278c7901da69d8ab49", "tree": "acf53470fd9ee29f6539de1e3cea691303b94af8", "parents": [ "97e0ba691222d037c1820ca8338ad13d07221daf", "f99551d8a149c1a80dddd6350efcfbd53d58e151" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Feb 12 02:56:56 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 02:56:56 2015 +0000" }, "message": "am f99551d8: am c7ccc393: Merge \"Make reportInetCondition revalidate if the report differs from our state\" into lmp-mr1-dev\n\n* commit \u0027f99551d8a149c1a80dddd6350efcfbd53d58e151\u0027:\n Make reportInetCondition revalidate if the report differs from our state\n" }, { "commit": "f99551d8a149c1a80dddd6350efcfbd53d58e151", "tree": "ac91e2077d8580e47ff16285664d1ea416bdbcba", "parents": [ "b73e029fea53fd5aeaf01ad7ba15560329d8de1c", "c7ccc393b470220710f566d447412d93f7f8d21b" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Feb 12 02:43:03 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 02:43:03 2015 +0000" }, "message": "am c7ccc393: Merge \"Make reportInetCondition revalidate if the report differs from our state\" into lmp-mr1-dev\n\n* commit \u0027c7ccc393b470220710f566d447412d93f7f8d21b\u0027:\n Make reportInetCondition revalidate if the report differs from our state\n" }, { "commit": "bee1def31bb7a3a22e7c83904a3d8c418eeb5e48", "tree": "c8fa7039da22a7c01eeecd446cc4cf08cab51a90", "parents": [ "3d576cc643497e5a4f0285dea75b7ba5e964009c", "97e0ba691222d037c1820ca8338ad13d07221daf" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Feb 12 02:34:42 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 02:34:42 2015 +0000" }, "message": "am 97e0ba69: am b73e029f: am 0ec652cf: Merge \"Add DENSITY_280\" into lmp-mr1-dev\n\n* commit \u002797e0ba691222d037c1820ca8338ad13d07221daf\u0027:\n Add DENSITY_280\n" }, { "commit": "c7ccc393b470220710f566d447412d93f7f8d21b", "tree": "4e57c92a1cde82c68d478504fb9973510809fe61", "parents": [ "0ec652cf72bd8b7f619462f172ac0152d4d6c83d", "0831f66f1949307bae54ccf01d70283005467085" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Feb 12 02:30:55 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 12 02:30:56 2015 +0000" }, "message": "Merge \"Make reportInetCondition revalidate if the report differs from our state\" into lmp-mr1-dev" }, { "commit": "fcde58f155e8a188078885ec7529a9fe4a67f10e", "tree": "c93e257b0ac49ea7d39f424fb2e37076b38fae01", "parents": [ "3292c0e2640667e5ef78896653a41c85e7de06c5" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Feb 11 16:51:13 2015 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Feb 11 18:28:57 2015 -0800" }, "message": "Update Javadoc for EXTRA_NETWORK.\n\nBug: 19352840\nChange-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef\n" }, { "commit": "97e0ba691222d037c1820ca8338ad13d07221daf", "tree": "9821e56739c43c385c5486aa6579a8a3241af6b2", "parents": [ "18d836b61811270bfae8cec6e0e782234dfcf5a4", "b73e029fea53fd5aeaf01ad7ba15560329d8de1c" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Feb 12 02:25:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 02:25:29 2015 +0000" }, "message": "am b73e029f: am 0ec652cf: Merge \"Add DENSITY_280\" into lmp-mr1-dev\n\n* commit \u0027b73e029fea53fd5aeaf01ad7ba15560329d8de1c\u0027:\n Add DENSITY_280\n" }, { "commit": "b73e029fea53fd5aeaf01ad7ba15560329d8de1c", "tree": "8e4672b9eb873e0da48661f1ee0fe661e04589fc", "parents": [ "40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55", "0ec652cf72bd8b7f619462f172ac0152d4d6c83d" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Feb 12 02:13:03 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 12 02:13:03 2015 +0000" }, "message": "am 0ec652cf: Merge \"Add DENSITY_280\" into lmp-mr1-dev\n\n* commit \u00270ec652cf72bd8b7f619462f172ac0152d4d6c83d\u0027:\n Add DENSITY_280\n" }, { "commit": "0ec652cf72bd8b7f619462f172ac0152d4d6c83d", "tree": "971cd0603979336924aa707913389398d1fa0414", "parents": [ "3292c0e2640667e5ef78896653a41c85e7de06c5", "f6d4045d6c386fe09eafb894aa1ff79ca6f04178" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Feb 12 02:08:03 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 12 02:08:04 2015 +0000" }, "message": "Merge \"Add DENSITY_280\" into lmp-mr1-dev" }, { "commit": "67bfa0b083ef0eef49b29b461afa65e5384ec429", "tree": "d86587257845856a5ac2a1a6b4b06b775ad0693c", "parents": [ "1a24bb597aeb1b019d55988b574e5db1b0e4232c" ], "author": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Fri Feb 06 15:44:00 2015 -0800" }, "committer": { "name": "Tao Bao", "email": "tbao@google.com", "time": "Wed Feb 11 17:50:21 2015 -0800" }, "message": "Use ICU for relative time formatting\n\nRewrite the DateUtils\u0027 relative time formatting APIs\n(getRelativeTimeSpanString, getRelativeDateTimeString) to use ICU ones.\nTwo APIs that take withPreposition parameter are not changed. Because\n(a) ICU doesn\u0027t provide functionality to format preposition; (b) They\nare not really computing relative time but instead calling\nformatDateRange() to get the absolute time/date string.\n\nBug: 19146457\nBug: 5252772\nChange-Id: Iea8d699d63cc4438513910da66d038912e44fb8d\n" }, { "commit": "b0acf7fcfab08b5af1f99daa51bedbb659d18926", "tree": "a70d89c222e8ec6e6fc88fec296a9d0c5694b65d", "parents": [ "3292c0e2640667e5ef78896653a41c85e7de06c5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Feb 11 15:41:12 2015 -0800" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Feb 11 16:58:10 2015 -0800" }, "message": "Legacy: Only set user surface dimensions on output surfaces\n\nThe GL layer gets exclusive use of the direct producer dimensions;\nwe should only set the user dimensions.\n\nBug: 16404608\nChange-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c\n" }, { "commit": "3d576cc643497e5a4f0285dea75b7ba5e964009c", "tree": "3fb308770ac252f817e2b2b310ed40957c8132e9", "parents": [ "33d3c53da021f0d044028860ace0f4ad817273f5", "18d836b61811270bfae8cec6e0e782234dfcf5a4" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Wed Feb 11 23:04:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 23:04:12 2015 +0000" }, "message": "am 18d836b6: Merge \"Don\\\u0027t relayout based on a window that isn\\\u0027t visible\" into lmp-mr1-modular-dev\n\n* commit \u002718d836b61811270bfae8cec6e0e782234dfcf5a4\u0027:\n Don\u0027t relayout based on a window that isn\u0027t visible\n" }, { "commit": "18d836b61811270bfae8cec6e0e782234dfcf5a4", "tree": "c01d1ea6e4845d533954c3d23ef688b7bf2365c8", "parents": [ "33bb70d613cf8ed4664c4cc4047ae67f98599b32", "082500c76e82139208b3792cdbc283ef59092e16" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Wed Feb 11 22:27:03 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 11 22:27:06 2015 +0000" }, "message": "Merge \"Don\u0027t relayout based on a window that isn\u0027t visible\" into lmp-mr1-modular-dev" }, { "commit": "f6d4045d6c386fe09eafb894aa1ff79ca6f04178", "tree": "8b124cb40778c99cc04e6c96c66721113303c1b6", "parents": [ "d7310bd1499c0b48594a8fbbcbe0c7e80c1e5832" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Feb 11 13:34:43 2015 -0800" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Feb 11 13:34:43 2015 -0800" }, "message": "Add DENSITY_280\n\nBug 19350604\n\nChange-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7\n" }, { "commit": "082500c76e82139208b3792cdbc283ef59092e16", "tree": "1371aed006bea76d0bb08c17d017ef01c128db0f", "parents": [ "f9259107342559456105392e3387a3c8a1e5d6e4" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Wed Feb 11 13:24:19 2015 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Wed Feb 11 13:24:19 2015 -0800" }, "message": "Don\u0027t relayout based on a window that isn\u0027t visible\n\nThe method commitFinishDrawingLocked returned true even if the window\nit was called for was hidden. By returning the value that\nperformShowLocked() returns it only returns true if the window is\nshown.\n\nFixes bug 19100757.\n\nChange-Id: I45df70aedcb3909561fd3a19e861579a11521db9\n" }, { "commit": "33d3c53da021f0d044028860ace0f4ad817273f5", "tree": "1ebd67dbfa35109595bd6258633abba7931f1290", "parents": [ "c093955af1434a7023093acb148ab152d915e59c", "517e0274cb2cfd215b20622280d5e256e8282bbb" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Wed Feb 11 12:37:12 2015 -0800" }, "committer": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Wed Feb 11 12:37:12 2015 -0800" }, "message": "resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a\n" }, { "commit": "c093955af1434a7023093acb148ab152d915e59c", "tree": "fb9c712cee8c52945c4c0c1d2e7de191148ddfe8", "parents": [ "fa5f1fbc50050d26535e969ac68b04d318bbaf03", "33bb70d613cf8ed4664c4cc4047ae67f98599b32" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed Feb 11 19:59:16 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 19:59:16 2015 +0000" }, "message": "am 33bb70d6: am 40bd8f41: Merge \"Stop active media projections on user switch.\" into lmp-mr1-dev automerge: 3292c0e\n\n* commit \u002733bb70d613cf8ed4664c4cc4047ae67f98599b32\u0027:\n" }, { "commit": "33bb70d613cf8ed4664c4cc4047ae67f98599b32", "tree": "949f5041f3aca31e91e31c994c2516dc7f8bb81f", "parents": [ "5d8a31c46c947c2c5f56669c00e6c8aea31c47f7", "40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed Feb 11 19:50:56 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 19:50:56 2015 +0000" }, "message": "am 40bd8f41: Merge \"Stop active media projections on user switch.\" into lmp-mr1-dev automerge: 3292c0e\n\n* commit \u002740bd8f416b30b7b0eae244aa0c5aabd0be0d1c55\u0027:\n Stop active media projections on user switch.\n" }, { "commit": "517e0274cb2cfd215b20622280d5e256e8282bbb", "tree": "c4faa0b3e8d1db30fc8a2deb3bb13b38de5a9364", "parents": [ "1641e192a82e266159e0b82078a8f98ebcd3d8ff", "1a24bb597aeb1b019d55988b574e5db1b0e4232c" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Wed Feb 11 19:34:30 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 19:34:30 2015 +0000" }, "message": "Merge \"Move hidden ApplicationInfo flags into a separate field.\"\nautomerge: 1a24bb5\n\n* commit \u00271a24bb597aeb1b019d55988b574e5db1b0e4232c\u0027:\n Move hidden ApplicationInfo flags into a separate field.\n" }, { "commit": "1a24bb597aeb1b019d55988b574e5db1b0e4232c", "tree": "c4faa0b3e8d1db30fc8a2deb3bb13b38de5a9364", "parents": [ "3fbbe396faffeec6b46796087ad1e075e9a21f0d", "b9f8a5204a1b0b3919fa921e858d04124c582828" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Wed Feb 11 19:27:14 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 11 19:27:14 2015 +0000" }, "message": "Merge \"Move hidden ApplicationInfo flags into a separate field.\"" }, { "commit": "b9f8a5204a1b0b3919fa921e858d04124c582828", "tree": "c4faa0b3e8d1db30fc8a2deb3bb13b38de5a9364", "parents": [ "3fbbe396faffeec6b46796087ad1e075e9a21f0d" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Tue Feb 03 11:12:59 2015 -0800" }, "committer": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Wed Feb 11 11:06:40 2015 -0800" }, "message": "Move hidden ApplicationInfo flags into a separate field.\n\nThe public API field android.content.pm.ApplicationInfo.flags can\nsupport only 32 flags. This limit has been reached. As a short term\nworkaround to enable new public flags to be added, this CL moves flags\nwhich are not public API into a separate new field privateFlags and\nrenames the affected flags constants accordingly (e.g., FLAG_PRIVILEGED\nis now PRIVATE_FLAG_PRIVILEGED).\n\nThe new privateFlags field is not public API and should not be used\nfor flags that are public API.\n\nThe flags that are moved out of ApplicationInfo.flags are:\n* FLAG_HIDDEN,\n* FLAG_CANT_SAVE_STATE,\n* FLAG_FORWARD_LOCK, and\n* FLAG_PRIVILEGED.\n\nNOTE: This changes the format of packages.xml. Prior to this CL flags\nwere stored in the \"flags\" attribute. With this CL, the public flags\nare stored in a new \"publicFlags\" attribute and private flags are\nstored in a new \"privateFlags\" attribute. The old \"flags\" attribute\nis interpreted by using the old values of hidden/private flags.\n\nChange-Id: Ie23eb8ddd5129de3c6e008c5261b639e22182ee5\n" }, { "commit": "fa5f1fbc50050d26535e969ac68b04d318bbaf03", "tree": "fb9c712cee8c52945c4c0c1d2e7de191148ddfe8", "parents": [ "0cc09449b6b1e418a7d04590e28d1336694230ba", "40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed Feb 11 18:43:29 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 18:43:29 2015 +0000" }, "message": "Merge \"Stop active media projections on user switch.\" into lmp-mr1-dev automerge: 3292c0e\nautomerge: 40bd8f4\n\n* commit \u002740bd8f416b30b7b0eae244aa0c5aabd0be0d1c55\u0027:\n Stop active media projections on user switch.\n" }, { "commit": "40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55", "tree": "24f16e56822d88a2007ee887d6f7249b3000a7f1", "parents": [ "46dbb5be4c56e8af603514a3cf2bd7daf0191724", "3292c0e2640667e5ef78896653a41c85e7de06c5" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed Feb 11 18:33:00 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 18:33:00 2015 +0000" }, "message": "Merge \"Stop active media projections on user switch.\" into lmp-mr1-dev\nautomerge: 3292c0e\n\n* commit \u00273292c0e2640667e5ef78896653a41c85e7de06c5\u0027:\n Stop active media projections on user switch.\n" }, { "commit": "3292c0e2640667e5ef78896653a41c85e7de06c5", "tree": "e7a2425a3bd7e321f682b6c0a78ff9d81201dfee", "parents": [ "50996a12a8e859346d5eb3c4569c4e81c9b52a05", "05aab5810a5f0296c3650f104c58479b2765c0b7" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed Feb 11 18:23:54 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 11 18:23:55 2015 +0000" }, "message": "Merge \"Stop active media projections on user switch.\" into lmp-mr1-dev" }, { "commit": "0cc09449b6b1e418a7d04590e28d1336694230ba", "tree": "826d824c1eacea948c447d0cc193d453b9a11f95", "parents": [ "1d053b868f9ab3d934956c59c33c7b4bb82ba589", "1641e192a82e266159e0b82078a8f98ebcd3d8ff" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Feb 11 17:15:47 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 17:15:47 2015 +0000" }, "message": "Merge \"Store compiled code in Context.getCodeCacheDir()\" automerge: 3fbbe39\nautomerge: 1641e19\n\n* commit \u00271641e192a82e266159e0b82078a8f98ebcd3d8ff\u0027:\n Store compiled code in Context.getCodeCacheDir()\n" }, { "commit": "1641e192a82e266159e0b82078a8f98ebcd3d8ff", "tree": "db0632c01c35a2f92e4dc574f8dc547044d3feea", "parents": [ "6da3cc59a0e77e723a8413d2443b0f1bc5821b03", "3fbbe396faffeec6b46796087ad1e075e9a21f0d" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Feb 11 17:11:06 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 17:11:06 2015 +0000" }, "message": "Merge \"Store compiled code in Context.getCodeCacheDir()\"\nautomerge: 3fbbe39\n\n* commit \u00273fbbe396faffeec6b46796087ad1e075e9a21f0d\u0027:\n Store compiled code in Context.getCodeCacheDir()\n" }, { "commit": "3fbbe396faffeec6b46796087ad1e075e9a21f0d", "tree": "db0632c01c35a2f92e4dc574f8dc547044d3feea", "parents": [ "396f131de7646faacd74ec3be11c4861bb233872", "51772b7601b7540be6ff4069dda2b83f057c7ce4" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Feb 11 17:08:00 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 11 17:08:01 2015 +0000" }, "message": "Merge \"Store compiled code in Context.getCodeCacheDir()\"" }, { "commit": "1d053b868f9ab3d934956c59c33c7b4bb82ba589", "tree": "05aa618453ea914fe28a8616491ff040c1b07cdf", "parents": [ "e4be48e0853bcde90d738031433271c5e41bd5e2", "5d8a31c46c947c2c5f56669c00e6c8aea31c47f7" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Feb 11 08:44:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 08:44:38 2015 +0000" }, "message": "am 5d8a31c4: am 46dbb5be: am 50996a12: Merge \"Do not enforce CONTROL_VPN for calls from lockdown VPN.\" into lmp-mr1-dev\n\n* commit \u00275d8a31c46c947c2c5f56669c00e6c8aea31c47f7\u0027:\n" }, { "commit": "e4be48e0853bcde90d738031433271c5e41bd5e2", "tree": "05aa618453ea914fe28a8616491ff040c1b07cdf", "parents": [ "0f0e93dc702e97644bacceb7ac08552672a8151d", "46dbb5be4c56e8af603514a3cf2bd7daf0191724" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Feb 11 08:38:35 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 08:38:35 2015 +0000" }, "message": "am 50996a12: Merge \"Do not enforce CONTROL_VPN for calls from lockdown VPN.\" into lmp-mr1-dev\nautomerge: 46dbb5b\n\n* commit \u002746dbb5be4c56e8af603514a3cf2bd7daf0191724\u0027:\n Do not enforce CONTROL_VPN for calls from lockdown VPN.\n" }, { "commit": "5d8a31c46c947c2c5f56669c00e6c8aea31c47f7", "tree": "45b94981c8a92028c9549de17baf5f450849be0d", "parents": [ "e1507ac506a4dac327a5cbabede0384836659de0", "46dbb5be4c56e8af603514a3cf2bd7daf0191724" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Feb 11 08:37:30 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 08:37:30 2015 +0000" }, "message": "am 46dbb5be: am 50996a12: Merge \"Do not enforce CONTROL_VPN for calls from lockdown VPN.\" into lmp-mr1-dev\n\n* commit \u002746dbb5be4c56e8af603514a3cf2bd7daf0191724\u0027:\n Do not enforce CONTROL_VPN for calls from lockdown VPN.\n" }, { "commit": "46dbb5be4c56e8af603514a3cf2bd7daf0191724", "tree": "2f09b351faed4c4b212fd6903b707f27ceef25a0", "parents": [ "00c8450d2711de57ee45f66cae1050dbca98d1f5", "50996a12a8e859346d5eb3c4569c4e81c9b52a05" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Feb 11 08:30:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 08:30:44 2015 +0000" }, "message": "am 50996a12: Merge \"Do not enforce CONTROL_VPN for calls from lockdown VPN.\" into lmp-mr1-dev\n\n* commit \u002750996a12a8e859346d5eb3c4569c4e81c9b52a05\u0027:\n Do not enforce CONTROL_VPN for calls from lockdown VPN.\n" }, { "commit": "50996a12a8e859346d5eb3c4569c4e81c9b52a05", "tree": "ee718a236ef383ecb3f68cb450b73997195d0800", "parents": [ "c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4", "b21298a686b04d55ff97223dd317497845713f4b" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Feb 11 08:25:26 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 11 08:25:27 2015 +0000" }, "message": "Merge \"Do not enforce CONTROL_VPN for calls from lockdown VPN.\" into lmp-mr1-dev" }, { "commit": "b21298a686b04d55ff97223dd317497845713f4b", "tree": "f601ce3c9ba7082f91d21dcf4bd17e6cf2fa1b68", "parents": [ "175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Tue Feb 10 10:02:11 2015 -0800" }, "committer": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Tue Feb 10 23:41:42 2015 -0800" }, "message": "Do not enforce CONTROL_VPN for calls from lockdown VPN.\n\nClearly document which methods in Vpn.java are designed to be used to\nservice a Binder call, and which must therefore check permissions and\nclear the calling identity, and which methods are designed for\ninternal use only and which therefore need not check permission.\n\nAdd a new startLegacyVpnPrivileged method which bypasses the\npermission checks, to be used by lockdown VPN which is a trusted\nsystem service. Ensure that the existing startLegacyVpn method checks\npermissions as this is used whenever we respond to a binder call.\n\nBug: 19311172\nChange-Id: I34f13258ee7481f1356bc523124cf5db068b4972\n" }, { "commit": "0f0e93dc702e97644bacceb7ac08552672a8151d", "tree": "02455cddd5e58c2e85a2c78f1d50bd2c12a8cdb6", "parents": [ "2d33b31c86ade166b97cbb9085e0185f765932cb", "e1507ac506a4dac327a5cbabede0384836659de0" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 07:39:23 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 07:39:23 2015 +0000" }, "message": "am e1507ac5: am 00c8450d: Merge \"Make getNetworkInfo() take into account VPN underlying networks.\" into lmp-mr1-dev automerge: c38b90b\n\n* commit \u0027e1507ac506a4dac327a5cbabede0384836659de0\u0027:\n" }, { "commit": "e1507ac506a4dac327a5cbabede0384836659de0", "tree": "958470288f0b922f9d1f414a52684b65a66d83c8", "parents": [ "c54a87e302a2a28b16864f71b9db57241d68ca48", "00c8450d2711de57ee45f66cae1050dbca98d1f5" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 07:33:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 07:33:10 2015 +0000" }, "message": "am 00c8450d: Merge \"Make getNetworkInfo() take into account VPN underlying networks.\" into lmp-mr1-dev automerge: c38b90b\n\n* commit \u002700c8450d2711de57ee45f66cae1050dbca98d1f5\u0027:\n Make getNetworkInfo() take into account VPN underlying networks.\n" }, { "commit": "2d33b31c86ade166b97cbb9085e0185f765932cb", "tree": "02455cddd5e58c2e85a2c78f1d50bd2c12a8cdb6", "parents": [ "ac46e8240470eefbfebb852906a1972ee5faf4db", "00c8450d2711de57ee45f66cae1050dbca98d1f5" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 07:32:53 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 07:32:53 2015 +0000" }, "message": "Merge \"Make getNetworkInfo() take into account VPN underlying networks.\" into lmp-mr1-dev automerge: c38b90b\nautomerge: 00c8450\n\n* commit \u002700c8450d2711de57ee45f66cae1050dbca98d1f5\u0027:\n Make getNetworkInfo() take into account VPN underlying networks.\n" }, { "commit": "00c8450d2711de57ee45f66cae1050dbca98d1f5", "tree": "021042802d3decda76c5ae27af08fa6b088b8701", "parents": [ "6b274720c5a210c07256e5b9fc11a1e9aca59017", "c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 07:24:50 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 07:24:50 2015 +0000" }, "message": "Merge \"Make getNetworkInfo() take into account VPN underlying networks.\" into lmp-mr1-dev\nautomerge: c38b90b\n\n* commit \u0027c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4\u0027:\n Make getNetworkInfo() take into account VPN underlying networks.\n" }, { "commit": "c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4", "tree": "6c78fc0f30d36378e129f89c18fbc83ef961f69f", "parents": [ "64ce5f8fab077e4792737f86502d0e77ad6cbb0b", "d6a7980dd9a52f082091cf000095b77a9d44565d" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 07:18:16 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 11 07:18:17 2015 +0000" }, "message": "Merge \"Make getNetworkInfo() take into account VPN underlying networks.\" into lmp-mr1-dev" }, { "commit": "ac46e8240470eefbfebb852906a1972ee5faf4db", "tree": "b5150488e8b9130cb9eda42c7d0c105733d62217", "parents": [ "b7e04f3294d2ce60450fcc6881249b6b0c6c30b0", "c54a87e302a2a28b16864f71b9db57241d68ca48" ], "author": { "name": "Shishir Agrawal", "email": "shishir@google.com", "time": "Wed Feb 11 06:28:28 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 06:28:28 2015 +0000" }, "message": "am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8\n\n* commit \u0027c54a87e302a2a28b16864f71b9db57241d68ca48\u0027:\n" }, { "commit": "b7e04f3294d2ce60450fcc6881249b6b0c6c30b0", "tree": "b5150488e8b9130cb9eda42c7d0c105733d62217", "parents": [ "5ff571155f0a405d6f7d298c7acaddc84bb8fb26", "6b274720c5a210c07256e5b9fc11a1e9aca59017" ], "author": { "name": "Shishir Agrawal", "email": "shishir@google.com", "time": "Wed Feb 11 03:44:42 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 03:44:42 2015 +0000" }, "message": "GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8\nautomerge: 6b27472\n\n* commit \u00276b274720c5a210c07256e5b9fc11a1e9aca59017\u0027:\n GpsLocationProvider: Read data enabled status from TelephonyManager.\n" }, { "commit": "c54a87e302a2a28b16864f71b9db57241d68ca48", "tree": "8008d12cc926cc3c161ac1cbd751f5136499df86", "parents": [ "d0d13d822cdec4fa7214d1495137064c28ecc07e", "6b274720c5a210c07256e5b9fc11a1e9aca59017" ], "author": { "name": "Shishir Agrawal", "email": "shishir@google.com", "time": "Wed Feb 11 03:41:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 03:41:38 2015 +0000" }, "message": "am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8\n\n* commit \u00276b274720c5a210c07256e5b9fc11a1e9aca59017\u0027:\n GpsLocationProvider: Read data enabled status from TelephonyManager.\n" }, { "commit": "6b274720c5a210c07256e5b9fc11a1e9aca59017", "tree": "77680286be741b037f03d05b1386af8af5f98bb5", "parents": [ "dc77ec59beb23a2ff300d5048633687c0d68a0ac", "64ce5f8fab077e4792737f86502d0e77ad6cbb0b" ], "author": { "name": "Shishir Agrawal", "email": "shishir@google.com", "time": "Wed Feb 11 03:35:42 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 11 03:35:42 2015 +0000" }, "message": "GpsLocationProvider: Read data enabled status from TelephonyManager.\nautomerge: 64ce5f8\n\n* commit \u002764ce5f8fab077e4792737f86502d0e77ad6cbb0b\u0027:\n GpsLocationProvider: Read data enabled status from TelephonyManager.\n" }, { "commit": "64ce5f8fab077e4792737f86502d0e77ad6cbb0b", "tree": "3ac8aa67bc95fcf440c8223af13b2642e4b7ccb6", "parents": [ "3bb5fdc7e607febaad3bd41ed7a36b596b7286af" ], "author": { "name": "Shishir Agrawal", "email": "shishir@google.com", "time": "Tue Feb 10 19:02:38 2015 -0800" }, "committer": { "name": "Shishir Agrawal", "email": "shishir@google.com", "time": "Tue Feb 10 19:20:16 2015 -0800" }, "message": "GpsLocationProvider: Read data enabled status from TelephonyManager.\n\nBug: 18814559\nChange-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9\n" }, { "commit": "0831f66f1949307bae54ccf01d70283005467085", "tree": "9e44ea080932976cb8eff4a52f3bcf464cd094c5", "parents": [ "d6a7980dd9a52f082091cf000095b77a9d44565d" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 07:39:20 2015 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 11:03:50 2015 +0900" }, "message": "Make reportInetCondition revalidate if the report differs from our state\n\n1. If reportInetCondition says the network is not working, and\n the network is already marked not validated, don\u0027t revalidate\n it. This was superfluous and should save battery.\n2. If reportInetCondition says the network is working, and the\n network is not marked as validated, revalidated. This will\n allow us to get out of a validated state quickly based on app\n input (e.g., allowing GCM\u0027s exponential backoff timer to drive\n revalidation instead of our 10-minute timer).\n\nBug: 19258761\nBug: 19209043\nChange-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3\n" }, { "commit": "d6a7980dd9a52f082091cf000095b77a9d44565d", "tree": "d6a4bafd7fa7aa4c85fce825cfb016b75517d182", "parents": [ "3bb5fdc7e607febaad3bd41ed7a36b596b7286af" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Feb 05 13:57:17 2015 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Feb 11 10:21:01 2015 +0900" }, "message": "Make getNetworkInfo() take into account VPN underlying networks.\n\nIf a user is subject to a VPN, getActiveNetworkInfo() will return\nthe VPN\u0027s underlying network (e.g., TYPE_WIFI), so that apps that\ncall getActiveNetworkInfo to answer questions like \"is the device\nconnected to wifi?\" will continue to work. Make getNetworkInfo\ndo this as well: if the query is for a network type that is\nunderlying the current user\u0027s VPN, then return that network.\n\nBug: 19196545\nChange-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6\n" }, { "commit": "5ff571155f0a405d6f7d298c7acaddc84bb8fb26", "tree": "57c84bf9be6427e5acd2bade94550040f71b0a49", "parents": [ "fb14e77f45fbad139a0b0c9278bd003964b8f987", "d0d13d822cdec4fa7214d1495137064c28ecc07e" ], "author": { "name": "Nick Vaccaro", "email": "nvaccaro@google.com", "time": "Wed Feb 11 00:20:52 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 00:20:52 2015 +0000" }, "message": "am d0d13d82: Merge \"Update API to contain new wrist tilt sensor type and string.\" into lmp-mr1-modular-dev\n\n* commit \u0027d0d13d822cdec4fa7214d1495137064c28ecc07e\u0027:\n Update API to contain new wrist tilt sensor type and string.\n" }, { "commit": "d0d13d822cdec4fa7214d1495137064c28ecc07e", "tree": "5b2dafa9d19974413514245d0d8178ef8b986eb2", "parents": [ "7aa7f841dccfc36bb79e21c43fbf3028d4c6cc1c", "f5021f68185f500d608d3765988f4f96f0c6be6b" ], "author": { "name": "Nick Vaccaro", "email": "nvaccaro@google.com", "time": "Wed Feb 11 00:15:15 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 11 00:15:18 2015 +0000" }, "message": "Merge \"Update API to contain new wrist tilt sensor type and string.\" into lmp-mr1-modular-dev" }, { "commit": "fb14e77f45fbad139a0b0c9278bd003964b8f987", "tree": "5c6dee4fa1f9c087105b3ef07b90425502f0bf32", "parents": [ "efa5b6142082d8c958b09a932fc972261c405912", "6da3cc59a0e77e723a8413d2443b0f1bc5821b03" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 11 00:00:57 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 11 00:00:57 2015 +0000" }, "message": "am 6da3cc59: am 396f131d: Merge \"Fix memory leak\"\n\n* commit \u00276da3cc59a0e77e723a8413d2443b0f1bc5821b03\u0027:\n Fix memory leak\n" }, { "commit": "6da3cc59a0e77e723a8413d2443b0f1bc5821b03", "tree": "aa5eb31a334808d6c422c6def6956eb821bc3311", "parents": [ "d1e074a72452c909c7ed2a4baf220d9d2f306b20", "396f131de7646faacd74ec3be11c4861bb233872" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 10 23:54:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 23:54:48 2015 +0000" }, "message": "am 396f131d: Merge \"Fix memory leak\"\n\n* commit \u0027396f131de7646faacd74ec3be11c4861bb233872\u0027:\n Fix memory leak\n" }, { "commit": "396f131de7646faacd74ec3be11c4861bb233872", "tree": "aa5eb31a334808d6c422c6def6956eb821bc3311", "parents": [ "fd523efcde98e97cd8c088f95198e6e13f4f8b64", "06524dccbc35cdeed92d0b5ec96b42d43518d7ed" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 10 23:46:27 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 10 23:46:27 2015 +0000" }, "message": "Merge \"Fix memory leak\"" }, { "commit": "06524dccbc35cdeed92d0b5ec96b42d43518d7ed", "tree": "aa5eb31a334808d6c422c6def6956eb821bc3311", "parents": [ "fd523efcde98e97cd8c088f95198e6e13f4f8b64" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 10 15:45:23 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 10 15:45:23 2015 -0800" }, "message": "Fix memory leak\n\nChange-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda\n" }, { "commit": "efa5b6142082d8c958b09a932fc972261c405912", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "85da6a5f06424d7b7cab98b41c24ce147a5d830a", "7aa7f841dccfc36bb79e21c43fbf3028d4c6cc1c" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Feb 10 23:21:41 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 23:21:41 2015 +0000" }, "message": "am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge \"Check that bitmap\\\u0027s size does not exceed 32 bits. DO NOT MERGE\" into lmp-mr1-dev\n\n* commit \u00277aa7f841dccfc36bb79e21c43fbf3028d4c6cc1c\u0027:\n" }, { "commit": "85da6a5f06424d7b7cab98b41c24ce147a5d830a", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "3efee706af3b9b9ff12c525b032f36f59eb66c80", "f9259107342559456105392e3387a3c8a1e5d6e4" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 23:21:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 23:21:27 2015 +0000" }, "message": "am f9259107: am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs automerge: 696b68c\n\n* commit \u0027f9259107342559456105392e3387a3c8a1e5d6e4\u0027:\n" }, { "commit": "3efee706af3b9b9ff12c525b032f36f59eb66c80", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "60e554a16affcc15d749b05d16490f0caa07fa83", "8ddf335a01cb9e83ceadd314739899895c84f0e1" ], "author": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Tue Feb 10 23:21:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 23:21:08 2015 +0000" }, "message": "am 8ddf335a: am 44998887: am 510c24e8: Merge \"Fix AAPT daemon mode with paths containg spaces.\" into lmp-mr1-dev\n\n* commit \u00278ddf335a01cb9e83ceadd314739899895c84f0e1\u0027:\n" }, { "commit": "60e554a16affcc15d749b05d16490f0caa07fa83", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "f184a008f9ce06f9653774c4bc9645a3b0abbbfb", "61dc64f38b2669a9e1599bc5595b760f31f586f7" ], "author": { "name": "Luan Nguyen", "email": "luann@google.com", "time": "Tue Feb 10 23:21:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 23:21:00 2015 +0000" }, "message": "am 61dc64f3: am 6ee90183: am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge \"docs: Fix various issues with incorrect code samples.\" into lmp-docs\n\n* commit \u002761dc64f38b2669a9e1599bc5595b760f31f586f7\u0027:\n" }, { "commit": "f184a008f9ce06f9653774c4bc9645a3b0abbbfb", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "3242e5d5d34afc4c11dee6fdf3f5ae78126e7ee6", "7372d2d1db3b56c2f6592c15a29d7c2fb00ccd1c" ], "author": { "name": "Eric Gilmore", "email": "egilmore@google.com", "time": "Tue Feb 10 23:20:19 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 23:20:19 2015 +0000" }, "message": "am 7372d2d1: am 2b7f0cff: am f35e8159: am 99b91b2f: am c9dbaf04: Merge \"Doc change: refactor GCM docs to be platform-agnostic.\" into lmp-docs automerge: 2b36779\n\n* commit \u00277372d2d1db3b56c2f6592c15a29d7c2fb00ccd1c\u0027:\n" }, { "commit": "3242e5d5d34afc4c11dee6fdf3f5ae78126e7ee6", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "a6fab6e114a80364714c463db3ac4b204730f08b", "79448424c3fedeab19f09a931511ad05c1b5ce63" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Feb 10 23:19:54 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 23:19:54 2015 +0000" }, "message": "am 79448424: am 43c7741c: Doze: pulse less often. automerge: 618e420\n\n* commit \u002779448424c3fedeab19f09a931511ad05c1b5ce63\u0027:\n" }, { "commit": "a6fab6e114a80364714c463db3ac4b204730f08b", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "524c46001f3f55552194b774c2e89c8c0ff0507c", "dc77ec59beb23a2ff300d5048633687c0d68a0ac" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Feb 10 22:21:09 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 10 22:21:09 2015 +0000" }, "message": "am 3bb5fdc7: Merge \"Check that bitmap\\\u0027s size does not exceed 32 bits. DO NOT MERGE\" into lmp-mr1-dev\nautomerge: dc77ec5 -s ours\n\n* commit \u0027dc77ec59beb23a2ff300d5048633687c0d68a0ac\u0027:\n Check that bitmap\u0027s size does not exceed 32 bits. DO NOT MERGE\n" }, { "commit": "7aa7f841dccfc36bb79e21c43fbf3028d4c6cc1c", "tree": "ec6725e025241ce5589549c33fa03a0fa23881e7", "parents": [ "f9259107342559456105392e3387a3c8a1e5d6e4", "dc77ec59beb23a2ff300d5048633687c0d68a0ac" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Feb 10 22:13:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 22:13:43 2015 +0000" }, "message": "am dc77ec59: am 3bb5fdc7: Merge \"Check that bitmap\\\u0027s size does not exceed 32 bits. DO NOT MERGE\" into lmp-mr1-dev\n\n* commit \u0027dc77ec59beb23a2ff300d5048633687c0d68a0ac\u0027:\n Check that bitmap\u0027s size does not exceed 32 bits. DO NOT MERGE\n" }, { "commit": "dc77ec59beb23a2ff300d5048633687c0d68a0ac", "tree": "78a0efe970c3866c7f21a153548acf11d6cb93a5", "parents": [ "accf0770306419773c3119eb32ca912077894b11", "3bb5fdc7e607febaad3bd41ed7a36b596b7286af" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Feb 10 22:08:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 22:08:00 2015 +0000" }, "message": "am 3bb5fdc7: Merge \"Check that bitmap\\\u0027s size does not exceed 32 bits. DO NOT MERGE\" into lmp-mr1-dev\n\n* commit \u00273bb5fdc7e607febaad3bd41ed7a36b596b7286af\u0027:\n Check that bitmap\u0027s size does not exceed 32 bits. DO NOT MERGE\n" }, { "commit": "3bb5fdc7e607febaad3bd41ed7a36b596b7286af", "tree": "1f2b3affed25194941b30db95c98cf5d4f67952c", "parents": [ "696b68c4fc65b671a00cfa82e6bc29a7d665828e", "89a2466a2a2859df5f29350117efd7f9d6a2e32f" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Feb 10 22:03:43 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 10 22:03:44 2015 +0000" }, "message": "Merge \"Check that bitmap\u0027s size does not exceed 32 bits. DO NOT MERGE\" into lmp-mr1-dev" }, { "commit": "51772b7601b7540be6ff4069dda2b83f057c7ce4", "tree": "5b253505a4b57a075fbbfc4868f9fdc03113e408", "parents": [ "fd523efcde98e97cd8c088f95198e6e13f4f8b64" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Tue Feb 10 12:41:42 2015 -0800" }, "committer": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Tue Feb 10 13:17:30 2015 -0800" }, "message": "Store compiled code in Context.getCodeCacheDir()\n\nbug 16345623\n\nUse Context.getCodeCacheDir for EGL shader cache and RenderScript\ncompiled code.\n\nChange-Id: I54c4e43674bd1f9342ae13059cb8899f4a3f4734\n" }, { "commit": "89a2466a2a2859df5f29350117efd7f9d6a2e32f", "tree": "6b85bb382a67da02359a05c09659d859a4c9da37", "parents": [ "61333d1b51ae36c9e5b1f4ea95bd00731c5e991a" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Mon Feb 09 15:42:19 2015 -0500" }, "committer": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Tue Feb 10 20:57:45 2015 +0000" }, "message": "Check that bitmap\u0027s size does not exceed 32 bits. DO NOT MERGE\n\nBUG:19270126\nChange-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea\n" }, { "commit": "524c46001f3f55552194b774c2e89c8c0ff0507c", "tree": "37bb6aa1b7a15d3c45a06914e44f088cc4f2941b", "parents": [ "4308c2aea45a4780b460734ee8634d74205c15c5", "accf0770306419773c3119eb32ca912077894b11" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 20:50:57 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 10 20:50:57 2015 +0000" }, "message": "am 24513bc5: am 31622894: am c86ac21f: Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs automerge: 696b68c\nautomerge: accf077\n\n* commit \u0027accf0770306419773c3119eb32ca912077894b11\u0027:\n Adding videos for 5.0 changes and watch face development.\n" }, { "commit": "f5021f68185f500d608d3765988f4f96f0c6be6b", "tree": "3d9565e9a8a84cce9a5171efc420122ec1a47f60", "parents": [ "f9259107342559456105392e3387a3c8a1e5d6e4" ], "author": { "name": "Nick Vaccaro", "email": "nvaccaro@google.com", "time": "Fri Jan 23 15:09:45 2015 -0800" }, "committer": { "name": "Nick Vaccaro", "email": "nvaccaro@google.com", "time": "Tue Feb 10 20:43:44 2015 +0000" }, "message": "Update API to contain new wrist tilt sensor type and string.\n\nConvert the wrist tilt sensor from being a vendor-defined sensor\ntype to being an official android sensor type.\n\nChange-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b\n" }, { "commit": "f9259107342559456105392e3387a3c8a1e5d6e4", "tree": "f20d58679a7882d279c99c9f8a6a5f7488b9e7e8", "parents": [ "8ddf335a01cb9e83ceadd314739899895c84f0e1", "accf0770306419773c3119eb32ca912077894b11" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 20:37:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 20:37:39 2015 +0000" }, "message": "am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs automerge: 696b68c\n\n* commit \u0027accf0770306419773c3119eb32ca912077894b11\u0027:\n Adding videos for 5.0 changes and watch face development.\n" }, { "commit": "accf0770306419773c3119eb32ca912077894b11", "tree": "7d24ad6a791dac7788a29f462ab662ca3b7db27d", "parents": [ "449988872be61f273c91db13069d5b7172429032", "696b68c4fc65b671a00cfa82e6bc29a7d665828e" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 20:25:34 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 10 20:25:34 2015 +0000" }, "message": "am 24513bc5: am 31622894: am c86ac21f: Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs\nautomerge: 696b68c\n\n* commit \u0027696b68c4fc65b671a00cfa82e6bc29a7d665828e\u0027:\n Adding videos for 5.0 changes and watch face development.\n" }, { "commit": "696b68c4fc65b671a00cfa82e6bc29a7d665828e", "tree": "b569ffa18a722160cad65f6677e52146d1389768", "parents": [ "510c24e8930447811f6725cbf7f3cefec2194a5d", "24513bc580024a8a90c1ceab6746c0abb452d678" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 20:17:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 20:17:53 2015 +0000" }, "message": "am 24513bc5: am 31622894: am c86ac21f: Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs\n\n* commit \u002724513bc580024a8a90c1ceab6746c0abb452d678\u0027:\n Adding videos for 5.0 changes and watch face development.\n" }, { "commit": "4308c2aea45a4780b460734ee8634d74205c15c5", "tree": "498f4cb77b8ec300600636ef72693736b9468cdd", "parents": [ "c6ec79913fbcf5b915ed55f3cc7b49690ee997f9", "449988872be61f273c91db13069d5b7172429032" ], "author": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Tue Feb 10 20:14:44 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 10 20:14:44 2015 +0000" }, "message": "am 510c24e8: Merge \"Fix AAPT daemon mode with paths containg spaces.\" into lmp-mr1-dev\nautomerge: 4499888\n\n* commit \u0027449988872be61f273c91db13069d5b7172429032\u0027:\n Fix AAPT daemon mode with paths containg spaces.\n" }, { "commit": "24513bc580024a8a90c1ceab6746c0abb452d678", "tree": "4e80534fec31c8a95a44f19f7b00202c527a8390", "parents": [ "ba795593e5941d89a861bb848c3f98800a0be3d6", "3162289445ebade804c422162578d328c4762372" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 20:10:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 20:10:38 2015 +0000" }, "message": "am 31622894: am c86ac21f: Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs\n\n* commit \u00273162289445ebade804c422162578d328c4762372\u0027:\n Adding videos for 5.0 changes and watch face development.\n" }, { "commit": "8ddf335a01cb9e83ceadd314739899895c84f0e1", "tree": "ac575c56dd0676f361afaaba2c00c367db68dfb8", "parents": [ "61dc64f38b2669a9e1599bc5595b760f31f586f7", "449988872be61f273c91db13069d5b7172429032" ], "author": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Tue Feb 10 20:07:28 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 20:07:28 2015 +0000" }, "message": "am 44998887: am 510c24e8: Merge \"Fix AAPT daemon mode with paths containg spaces.\" into lmp-mr1-dev\n\n* commit \u0027449988872be61f273c91db13069d5b7172429032\u0027:\n Fix AAPT daemon mode with paths containg spaces.\n" }, { "commit": "3162289445ebade804c422162578d328c4762372", "tree": "5245099ad976cf5385aa2ae1a636bac43affe1ce", "parents": [ "9b432bbece3cca6316b2638a947983e21c65917f", "c86ac21f7393e579ad1585396ce3c212bf7d3bfb" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 20:04:17 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 20:04:17 2015 +0000" }, "message": "am c86ac21f: Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs\n\n* commit \u0027c86ac21f7393e579ad1585396ce3c212bf7d3bfb\u0027:\n Adding videos for 5.0 changes and watch face development.\n" }, { "commit": "449988872be61f273c91db13069d5b7172429032", "tree": "66f476e5dabe691da6e02c18267c19e91254241a", "parents": [ "6ee90183ab79f9c3b5216a9b0b6518de7679734a", "510c24e8930447811f6725cbf7f3cefec2194a5d" ], "author": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Tue Feb 10 20:01:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 20:01:00 2015 +0000" }, "message": "am 510c24e8: Merge \"Fix AAPT daemon mode with paths containg spaces.\" into lmp-mr1-dev\n\n* commit \u0027510c24e8930447811f6725cbf7f3cefec2194a5d\u0027:\n Fix AAPT daemon mode with paths containg spaces.\n" }, { "commit": "c86ac21f7393e579ad1585396ce3c212bf7d3bfb", "tree": "a2c541c06b2ed58e75116e63bae0064c30feecc0", "parents": [ "e49fbfa21ccdeba56001b48604524794acea119e", "d86211292eda0aa27e0b2f05214601279b193b3f" ], "author": { "name": "Shanea King-Roberson", "email": "kingroberson@google.com", "time": "Tue Feb 10 19:57:29 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 10 19:57:30 2015 +0000" }, "message": "Merge \"Adding videos for 5.0 changes and watch face development.\" into lmp-docs" }, { "commit": "510c24e8930447811f6725cbf7f3cefec2194a5d", "tree": "4d35b7bddc59b1a6ca4fe241a27751ab58c3dd5a", "parents": [ "18fc7b85543cd21317475962521606038cd44383", "de3ab0a9e8609f6a631b2c047f352069bb9cfa86" ], "author": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Tue Feb 10 19:56:31 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 10 19:56:32 2015 +0000" }, "message": "Merge \"Fix AAPT daemon mode with paths containg spaces.\" into lmp-mr1-dev" }, { "commit": "c6ec79913fbcf5b915ed55f3cc7b49690ee997f9", "tree": "4b35c9f7e5b36c46a7369c43d271e542ec24de09", "parents": [ "ac4dfec8b3e15405fc0b0eba581169e7feef28ff", "6ee90183ab79f9c3b5216a9b0b6518de7679734a" ], "author": { "name": "Luan Nguyen", "email": "luann@google.com", "time": "Tue Feb 10 19:18:37 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 10 19:18:37 2015 +0000" }, "message": "am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge \"docs: Fix various issues with incorrect code samples.\" into lmp-docs\nautomerge: 6ee9018\n\n* commit \u00276ee90183ab79f9c3b5216a9b0b6518de7679734a\u0027:\n docs: Fix various issues with incorrect code samples.\n" }, { "commit": "ac4dfec8b3e15405fc0b0eba581169e7feef28ff", "tree": "19c54baf578424d86c653a0d73e664516b8e2218", "parents": [ "90fc289102465e7c267d3f19f7e3e5c56beb5fc0", "2b7f0cff1eebdb56a0c09bf5aec712df45147e25" ], "author": { "name": "Eric Gilmore", "email": "egilmore@google.com", "time": "Tue Feb 10 19:16:49 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 10 19:16:49 2015 +0000" }, "message": "am f35e8159: am 99b91b2f: am c9dbaf04: Merge \"Doc change: refactor GCM docs to be platform-agnostic.\" into lmp-docs automerge: 2b36779\nautomerge: 2b7f0cf\n\n* commit \u00272b7f0cff1eebdb56a0c09bf5aec712df45147e25\u0027:\n Doc change: refactor GCM docs to be platform-agnostic.\n" } ], "next": "61dc64f38b2669a9e1599bc5595b760f31f586f7" }