)]}' { "log": [ { "commit": "60617373a5cd3da68df2d03955adf2ea2e846509", "tree": "32fd0cd03cd3701016135fade63254f504468939", "parents": [ "e71ecb2c4df15f727f51a0e1b65459f071853e35" ], "author": { "name": "Yang Ni", "email": "yangni@google.com", "time": "Wed Jun 29 12:44:06 2016 -0700" }, "committer": { "name": "Yang Ni", "email": "yangni@google.com", "time": "Fri Sep 02 17:25:49 2016 -0700" }, "message": "Updated user document for Single-Source RenderScript\n\nBug: 29875503\nBug: 29879448\n\nAdded a section introducing the new single-source feature.\n\nLocal staging:\nhttp://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html\n\nThis updates\nhttps://developer.android.com/guide/topics/renderscript/compute.html\n\nChange-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13\n(cherry picked from commit c069ed7f8c3d307c9fed2c8d1a81e28152190b5a)\n" }, { "commit": "95e42d97f4b5150db2dcf1c26b3b50e6e133d1e4", "tree": "01784b7fc552ea36444ccdd9a2a4c27bd8cd8c80", "parents": [ "8f7223e420785962487995baad89f654fa1cc8ce", "ed6625d9074a1de1515c97faf201a91fbb3abb27" ], "author": { "name": "David Gross", "email": "dgross@google.com", "time": "Thu Jul 21 11:43:15 2016 -0700" }, "committer": { "name": "David Gross", "email": "dgross@google.com", "time": "Thu Jul 21 11:43:15 2016 -0700" }, "message": "resolve merge conflicts of ed6625d to stage-aosp-master\n\nChange-Id: Icae5872d5e220ac18a35e338f10b194c286855a8\n" }, { "commit": "05eef3040ed1bbd7640151b395072b8264b6d53d", "tree": "cdf52c7f2deac90809206ec5d6982d39743bca2a", "parents": [ "ee4c8fb9ebfd014fc6bc0fd2cc24ada2c078455e" ], "author": { "name": "David Gross", "email": "dgross@google.com", "time": "Wed Jul 20 16:04:35 2016 -0700" }, "committer": { "name": "David Gross", "email": "dgross@google.com", "time": "Wed Jul 20 16:04:35 2016 -0700" }, "message": "Update RenderScript docs: reduction, other API 23/24 changes, cleanup.\n\nSubstantive changes:\n- Add discussion of reduction kernels.\n- Use RS_KERNEL in place of __attribute__((kernel)).\n- Discuss \"context\" special argument.\n- Special arguments x, y, z may be of type int.\n- Discuss multiple inputs for mapping kernels.\n- Mention that script-side global writes are not visible in Java.\n- Rewrite part of discussion regarding when to use support library.\n- Change minimum device version for support library from Android 2.2 (API level 8)\n to Android 2.3 (API level 9).\n\nStylistic changes (better conformance with style guide):\n- Proper use of \u003ci\u003e (italic) versus \u003cem\u003e (emphasis).\n- Proper case for headings.\n- Proper pattern for Android version numbers.\n- Do not use e.g. or i.e.\n- Prefer active rather than passive voice.\n- Prefer present rather than future tense.\n\nMiscellaneous minor editorial changes.\n\nBug: 27299393\nBug: 30000147\n\nChange-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f\n" }, { "commit": "2a3336813a5cde4c3f3a7c65d7eb0c38c81fcb07", "tree": "15f1d2574bc080edaf6116d5744b29cb81e95829", "parents": [ "160126e2d8ec1605beb00030706194ff6d8bc4ba", "d5af0a121418e8707f75f8b02141ea0035a33d70" ], "author": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Mon Jun 20 22:01:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 20 22:01:02 2016 +0000" }, "message": "Docs: Changed sample link under Related Samples am: ab5de09e7e\nam: d5af0a1214\n\nChange-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9\n" }, { "commit": "d5af0a121418e8707f75f8b02141ea0035a33d70", "tree": "4dd7dc51015aa778438d0bd5de9cc6156f3e5788", "parents": [ "cd9cc200d8f0cc19aa4e762a7aace5564b7575ee", "ab5de09e7ea04de06f93c919904b0b5709d9042c" ], "author": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Mon Jun 20 21:53:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 20 21:53:54 2016 +0000" }, "message": "Docs: Changed sample link under Related Samples\nam: ab5de09e7e\n\nChange-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278\n" }, { "commit": "ab5de09e7ea04de06f93c919904b0b5709d9042c", "tree": "ef1b54398cd1dd81f426a8ba208aae4fc9a2aeea", "parents": [ "3c8b96ad1f1a42a5ae7bacd9234bcd6e7219a924" ], "author": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Fri Jun 17 16:29:47 2016 -0700" }, "committer": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Fri Jun 17 16:29:47 2016 -0700" }, "message": "Docs: Changed sample link under Related Samples\n\nChanged the Hello Compute sample link to point to Github Android Samples page\n\nBug: 28928053\nChange-Id: I0673620f8beb03297b5dea0b50f4ddbd9d6e25db\n" }, { "commit": "87613775159568cbe872770c3bbe78e496e101db", "tree": "304b4a9e3a5c670d5c45d497b154b6fb112a2dbb", "parents": [ "b2a45c00f6710b2cec2ad30a2c47973dfe91d437" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Wed Jun 15 10:50:42 2016 -0700" }, "committer": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Wed Jun 15 10:50:42 2016 -0700" }, "message": "docs: removing duplicate security config doc\n\ncurrent doc: https://developer.android.com/preview/features/security-config.html\nThe N Preview version of this page will move to this location when N is\nofficially released.\n\nChange-Id: Idf3bb2ea13b5f08efd3187bb1b1fbb6944519507\n" }, { "commit": "68d5e4b9ffd00edd5b8648a9cece9f2b5ac0f48a", "tree": "0de1a6d9c496e82f6ec31b16a3ec505244d16958", "parents": [ "130db7715a8457c1891de67b240c188a7bd67871", "423fe7db6a356d1942f3c39bf01dc186ffd933cb" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 17:37:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 14 17:37:38 2016 +0000" }, "message": "Merge \\\\\"Fix broken {@docRoot} links\\\\\" into mnc-io-docs am: a0fa50e40b\nam: 423fe7db6a\n\nChange-Id: I192297bc254d199e25249952591b3b2a1fc2b617\n" }, { "commit": "423fe7db6a356d1942f3c39bf01dc186ffd933cb", "tree": "44388bc426ead368fab116e9f8bd2f63ef98bd29", "parents": [ "106af828507a4f35470997abffcf867f0c75af2a", "a0fa50e40beb9fad61ea9f33b931ee302feab1a0" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 17:27:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 14 17:27:57 2016 +0000" }, "message": "Merge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs\nam: a0fa50e40b\n\nChange-Id: I7dd53f31f44262e09624d23d820723893aaba5c7\n" }, { "commit": "a0fa50e40beb9fad61ea9f33b931ee302feab1a0", "tree": "175ff80592e6b11a6f07d2138b0c5bb0cf5bee83", "parents": [ "99677fb42deb6ff3fe5cd0b1f4ff9787f3e4adf1", "abc918b76a8d23263c5da36b6432691f63e07bcc" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 17:14:57 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 14 17:14:59 2016 +0000" }, "message": "Merge \"Fix broken {@docRoot} links\" into mnc-io-docs" }, { "commit": "8bf5f6c8518b00aafc68a82bbc5fbe28604275a1", "tree": "665ef09e1a86f12303db5b26ae423759dd316bf5", "parents": [ "3f1741a19ce5a28114a374decda07977c84aaf9d", "1729c75f73ac9f1c58ff33a64b7a3c3fb472f091" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 00:57:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 14 00:57:24 2016 +0000" }, "message": "Merge \\\\\"Swap fill_parent with match_parent in best practices doc.\\\\\" into mnc-io-docs am: df4528fbe8\nam: 1729c75f73\n\nChange-Id: I074f24ee54e2ec7005e31a6528f54068c6e1eb3c\n" }, { "commit": "3f1741a19ce5a28114a374decda07977c84aaf9d", "tree": "b59c928b487cf4bfe9176177a662eaec047de961", "parents": [ "c738e48ed6a25108cb330fb224975bb6677bc9b3", "ce2e9d8716a0c56f7a7dae0eadbd014dd8b83b23" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 00:57:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 14 00:57:18 2016 +0000" }, "message": "Merge \\\\\"Correct parentActivity example in Activity Element docs.\\\\\" into mnc-io-docs am: 893413e50c\nam: ce2e9d8716\n\nChange-Id: I90462329a4fbdd264714c653b0df30cbc9f4f866\n" }, { "commit": "1729c75f73ac9f1c58ff33a64b7a3c3fb472f091", "tree": "2552e1f79ae2ae2a0547985c061356946c7d6d8a", "parents": [ "ce2e9d8716a0c56f7a7dae0eadbd014dd8b83b23", "df4528fbe8a68b5b2dc8354105e59b36e21f38e3" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 00:48:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 14 00:48:50 2016 +0000" }, "message": "Merge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc-io-docs\nam: df4528fbe8\n\nChange-Id: Ie2039cf96c3591b6fc2c0cb8ec1097707edcc76b\n" }, { "commit": "ce2e9d8716a0c56f7a7dae0eadbd014dd8b83b23", "tree": "549fc0641e3c92712fed0a3e1df703ead7c965e9", "parents": [ "999b7afac83d544f6838f747c3916601bbd0e00b", "893413e50ce708b856d25b199693bb998004aba1" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 00:48:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 14 00:48:43 2016 +0000" }, "message": "Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs\nam: 893413e50c\n\nChange-Id: I845619909443f9d56bfc7d9f5284b15c2587c5d6\n" }, { "commit": "df4528fbe8a68b5b2dc8354105e59b36e21f38e3", "tree": "b5ff0ff5d1f366b934ba3d7621a0a8088cfd4a3b", "parents": [ "893413e50ce708b856d25b199693bb998004aba1", "fa1965e31669fcaeffa19d40c1b76fd9623d78da" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 00:33:19 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 14 00:33:20 2016 +0000" }, "message": "Merge \"Swap fill_parent with match_parent in best practices doc.\" into mnc-io-docs" }, { "commit": "abc918b76a8d23263c5da36b6432691f63e07bcc", "tree": "91498e4626906926e08555efeb629c86316123fd", "parents": [ "893413e50ce708b856d25b199693bb998004aba1" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed Jun 08 11:20:03 2016 -0700" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 14 00:32:22 2016 +0000" }, "message": "Fix broken {@docRoot} links\n\nSome {@docRoot} links were followed by a \"/\" causing links to break.\n\nBug:\nhttps://code.google.com/p/android/issues/detail?id\u003d174753\n\nChange-Id: Ic5923ee447c55ac2aa95af365ae63425041e4fcf\n(cherry picked from commit e0af48d190114afcd0c7a615187fd524aecda512)\n" }, { "commit": "18240e6ebc70fdc1150c1808bad6e6890a4e45ca", "tree": "0c2038048fd5aace68d85512bbbc6f3a15024f5e", "parents": [ "e4b114932054b52b66989ff90b01eff91e9e5f2b" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed Jun 08 17:09:26 2016 -0700" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Thu Jun 09 20:20:07 2016 +0000" }, "message": "Correct parentActivity example in Activity Element docs.\n\nBug:\nhttps://code.google.com/p/android/issues/detail?id\u003d74474\n\nChange-Id: I09d07a69d6aa0087e60443ed819541e979012948\n(cherry picked from commit 0b54c6c74a28d7c96ffef80baaa0ddb6b9881ff9)\n" }, { "commit": "e82ac10fa29f1f076cf5fd7ab25f0f7a072254db", "tree": "e95b0fd4263beaf0f393d71908d1ea0c1ef5075a", "parents": [ "9ac187304bacc9116395d97f36e7e6471b34a609", "6e705386004abcb6810954c0a324498ba8e43f18" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Thu Jun 09 16:57:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 09 16:57:02 2016 +0000" }, "message": "Merge \\\\\"Correct the size of example bitmap for xxhdpi.\\\\\" into mnc-io-docs am: 396ed8d2cf\nam: 6e70538600\n\nChange-Id: I0714693f2f19107d056be72944343c9636a0ff7e\n" }, { "commit": "fa1965e31669fcaeffa19d40c1b76fd9623d78da", "tree": "eb428e76dab8202969e5ff94c214dd83fc25b1fb", "parents": [ "396ed8d2cf8be827c0900e327ed0a6483c4476f2" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed Jun 08 17:38:38 2016 -0700" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Thu Jun 09 16:47:25 2016 +0000" }, "message": "Swap fill_parent with match_parent in best practices doc.\n\nBug:\nhttps://code.google.com/p/android/issues/detail?id\u003d61600\n\nChange-Id: I86ef4f69800c3271fe6e4a5b09a184b2de7f6bc9\n(cherry picked from commit 309e97fc3c05135261d6c5e4ac054e53f081637c)\n" }, { "commit": "6e705386004abcb6810954c0a324498ba8e43f18", "tree": "aad3dc8252e82c9547af611697f6a0055be6a481", "parents": [ "9bd21c0fbbc422c49c329a5052d2394df004cc1d", "396ed8d2cf8be827c0900e327ed0a6483c4476f2" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Thu Jun 09 16:45:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 09 16:45:15 2016 +0000" }, "message": "Merge \\\"Correct the size of example bitmap for xxhdpi.\\\" into mnc-io-docs\nam: 396ed8d2cf\n\nChange-Id: Idb10cf41ebddc99613fcac41e9b6367c6e6b9e46\n" }, { "commit": "56334c5202bcf66098a2d547e21a5bade2da7f10", "tree": "20d907f966cb23043373067c530f8632706bfa2d", "parents": [ "ba9c3d585fd9e995e43842fe78f4240526c4fcf3" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 07 16:52:06 2016 -0700" }, "committer": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Wed Jun 08 18:06:29 2016 +0000" }, "message": "Correct the size of example bitmap for xxhdpi.\n\nBug:\nhttps://code.google.com/p/android/issues/detail?id\u003d156314\n\nChange-Id: Ib95efa2767aa52cb2e11195499828ca41e58eb50\n(cherry picked from commit 8c719cece6c6fa794d0f8401839a742923731656)\n" }, { "commit": "b04f86acae9f5a0101e997a2dde08342c92b180f", "tree": "a227443edfdcdec93aec31011138623bd9c4fa6c", "parents": [ "d05a7b5972cb06f711cc8cfa66efa9f0f6d901a5", "f5250c5b372ce3246bdc1e67212dc1fc7ca468ad" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Jun 01 18:10:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 01 18:10:43 2016 +0000" }, "message": "cherry-pick: docs: Added note that \u003capplication\u003e at end of manifest. am: d5368b8185\nam: f5250c5b37\n\n* commit \u0027f5250c5b372ce3246bdc1e67212dc1fc7ca468ad\u0027:\n cherry-pick: docs: Added note that \u003capplication\u003e at end of manifest.\n\nChange-Id: I55b4b106e27d642878f8c1050c82594a21ff4574\n" }, { "commit": "f5250c5b372ce3246bdc1e67212dc1fc7ca468ad", "tree": "7e2a59a5ed0cb520e902c3619e3eeb1d1f783381", "parents": [ "2cbac3c122e1114f72ef44c3e62c8ec7c372db94", "d5368b81857a04879ed55be2a67f034cce4e5094" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Jun 01 18:02:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 01 18:02:22 2016 +0000" }, "message": "cherry-pick: docs: Added note that \u003capplication\u003e at end of manifest.\nam: d5368b8185\n\n* commit \u0027d5368b81857a04879ed55be2a67f034cce4e5094\u0027:\n cherry-pick: docs: Added note that \u003capplication\u003e at end of manifest.\n\nChange-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489\n" }, { "commit": "d5368b81857a04879ed55be2a67f034cce4e5094", "tree": "e35f1b94c88b603803ad5d29d0f5e775b4f5f715", "parents": [ "1ce2279423a544d431bf6b64f2bfeb1a4617120b" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Tue May 31 14:56:34 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Tue May 31 19:41:52 2016 -0700" }, "message": "cherry-pick: docs: Added note that \u003capplication\u003e at end of manifest.\n\nAfter cherry picking, removed trailing whitespace at end of lines.\n\nBug: 28823898\nChange-Id: I30d69f1877d772893965e1512455f3addb397c80\nOriginal-Change-Id: I9d4e67c30a0e95e78a596c933c9b9d4804eb4d6a\n" }, { "commit": "747d945b2c8717e9a501c861a3caf20633355979", "tree": "fe9e85beb1697dae8e04109664cc0a513874bcbc", "parents": [ "be2527b964796aa490f94043deedc2ad7bcd222d", "71b5005a66872c25aaf71be865246294d0888279" ], "author": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Sat May 28 01:24:52 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat May 28 01:24:52 2016 +0000" }, "message": "Merge \"Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample\" into mnc-io-docs am: 709f0df0d8\nam: 71b5005a66\n\n* commit \u002771b5005a66872c25aaf71be865246294d0888279\u0027:\n Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample\n\nChange-Id: I09b59dd2cc85de4478012e2326bfce1cfd314e6b\n" }, { "commit": "71b5005a66872c25aaf71be865246294d0888279", "tree": "7cd91d32b7c5d66f0dcad6da7b61639b0ee9c53d", "parents": [ "3152ead0f8cb5994100a423b47907db06d8e0d7b", "709f0df0d883ee5351d4f5688360fa76f9a84dbc" ], "author": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Sat May 28 01:20:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat May 28 01:20:26 2016 +0000" }, "message": "Merge \"Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample\" into mnc-io-docs\nam: 709f0df0d8\n\n* commit \u0027709f0df0d883ee5351d4f5688360fa76f9a84dbc\u0027:\n Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample\n\nChange-Id: Idee5539ed59ec115e90b4f5413f385e8d51369d8\n" }, { "commit": "709f0df0d883ee5351d4f5688360fa76f9a84dbc", "tree": "a0d052b8a2fff78f2ae0778babc7f9908a6234e7", "parents": [ "d6c76ddc51a1b607c50d8e443a7affb9b2e0e1b6", "eb956877451d387a68eddde1c487b3430f3a2900" ], "author": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Sat May 28 01:16:49 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 28 01:16:51 2016 +0000" }, "message": "Merge \"Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample\" into mnc-io-docs" }, { "commit": "397ae7a2e618271abd2fa6480600c5c7e9be740c", "tree": "8d14c1343e2dcbdc8fc92c3be056b16ee61cbcca", "parents": [ "0f1ae5fa0f405bc3ec040fe512f7fad86577ce9f", "7f7eec31f8d8cb1a329ee2ca0571c29c8728b434" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Thu May 26 14:57:15 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Thu May 26 14:57:15 2016 -0700" }, "message": "resolve merge conflicts of 7f7eec3 to nyc-dev\n\nChange-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668\n" }, { "commit": "7f7eec31f8d8cb1a329ee2ca0571c29c8728b434", "tree": "7e65f76108bdaba36caf8db4f89cfcd53a5da439", "parents": [ "400aed3556d837e746252e1be03dd1ac54a383e5", "f23477385edbf1e8ecc8c280867fb39698da4b8d" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Thu May 26 20:59:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 26 20:59:57 2016 +0000" }, "message": "Merge \"Cherry pick: docs: Edited \"Features Reference\" section in \"\u003cuses-feature\u003e\" page.\" into mnc-io-docs\nam: f23477385e\n\n* commit \u0027f23477385edbf1e8ecc8c280867fb39698da4b8d\u0027:\n Cherry pick: docs: Edited \"Features Reference\" section in \"\u003cuses-feature\u003e\" page.\n\nChange-Id: I59ebda20856fd90f50968f9a341b8f87ce2bd9c1\n" }, { "commit": "da90584135a0b19f9f38abd93ef27f3f045cd3de", "tree": "018b3d3f5a9c4c8a02cdac9f67828a78776b2232", "parents": [ "c8c2abed0e7418d7e0fb0ef73a0c363cec011b95" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri Apr 29 10:40:47 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Thu May 26 10:51:02 2016 -0700" }, "message": "Cherry pick: docs: Edited \"Features Reference\" section in\n\"\u003cuses-feature\u003e\" page.\n\nThe \"Features Reference\" section now lists all hardware and software\nfeatures that apps can use on devices running Marshmallow, and some\nexisting features now have more descriptive examples.\n\nConverted the tables listing hardware and software features to h4\nelements and definition lists to make the page more reader-friendly,\nparticularly on handheld devices.\n\nBug: 27803596\nChange-Id: I3490f5dcde6a838d69940c70e06d9cd2cb8a7bdc\n" }, { "commit": "eb956877451d387a68eddde1c487b3430f3a2900", "tree": "fa7a41624b1e1f136d0072f1e87520d33cbd9545", "parents": [ "cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86" ], "author": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Wed May 25 18:00:18 2016 -0700" }, "committer": { "name": "Hemal Patel", "email": "hemalp@google.com", "time": "Wed May 25 19:11:59 2016 -0700" }, "message": "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI\npatterns docs sample\n\nBug: 28679030\nChange-Id: Ia8f30fa82dbbced9c177e39a61834f25d5b331b2\n" }, { "commit": "a4316e962c8f22f1adf7eca4763b2a29e4286846", "tree": "b8f41433024fac8923535e5b77874c0659f1b9d7", "parents": [ "b5b03bc450235ffa85ac636da460b61f1e99bff1", "6badb0fb54a72026dfe5d04e2556637b116a9c91" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 18:45:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 18:45:25 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 am: f7688a4f29\nam: 6badb0fb54\n\n* commit \u00276badb0fb54a72026dfe5d04e2556637b116a9c91\u0027:\n Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\n\nChange-Id: Ie324dd06265e48abe229c101f638e98e906bb199\n" }, { "commit": "6badb0fb54a72026dfe5d04e2556637b116a9c91", "tree": "055f0aac3b1b5dd7fb5e45fdb525e8fa58ba1cfd", "parents": [ "6b077de7d7c02f46c3a74430fa1b739d23d8c1c2", "f7688a4f297fcab18ffdbd0ed10405ba862e8ec9" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 18:35:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 18:35:30 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53\nam: f7688a4f29\n\n* commit \u0027f7688a4f297fcab18ffdbd0ed10405ba862e8ec9\u0027:\n Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\n\nChange-Id: I7f3c0af53759216af85351d950631af81cdf1316\n" }, { "commit": "f7688a4f297fcab18ffdbd0ed10405ba862e8ec9", "tree": "fe221ffdb0e962762fc9236f50e6df1e4f2aac41", "parents": [ "8dc9a826d5b7d5a9e4e83374430f95a38a7775e3", "c387613d53284816ebb00ebeb41633f6179fc972" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 18:31:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 18:31:33 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1\nam: c387613d53\n\n* commit \u0027c387613d53284816ebb00ebeb41633f6179fc972\u0027:\n Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\n\nChange-Id: I648ee1970cae83a816e9462dcbdd2208b7c205d4\n" }, { "commit": "c387613d53284816ebb00ebeb41633f6179fc972", "tree": "8b64afb7d3394ac6419c29e174950362d8f76892", "parents": [ "940de083a3e2ac5176f36d5b8bd6f88f5d1813dd", "8fc4c789f1a356d765e98b0c3f1569fabbfb0890" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 18:21:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 18:21:26 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c\nam: 8fc4c789f1\n\n* commit \u00278fc4c789f1a356d765e98b0c3f1569fabbfb0890\u0027:\n Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\n\nChange-Id: I42b9e0c852a685bd0ae1d5dd1145769b9dfd095d\n" }, { "commit": "8fc4c789f1a356d765e98b0c3f1569fabbfb0890", "tree": "59c95e6eb62fd3e7d1660b81cad374359d93acf8", "parents": [ "dbfd7dd16a383e41f5a59c2b63231e0848563770", "f6987bc94c00fa1390aee6f665a560dcb94d7942" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 18:10:27 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 18:10:27 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs am: 36785ff4bd am: b6f51341e8\nam: f6987bc94c\n\n* commit \u0027f6987bc94c00fa1390aee6f665a560dcb94d7942\u0027:\n Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\n\nChange-Id: Ice3af646ca302dea7797a2ff65ed83da7beaaa90\n" }, { "commit": "f6987bc94c00fa1390aee6f665a560dcb94d7942", "tree": "0666fa549d1c29c567d109828448198a1b76c795", "parents": [ "0f76f78f8274ed924fd922a619dd1c03f67b4ebf", "b6f51341e8bb34de8dfdc2694599c7090971fdf8" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 17:59:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 17:59:55 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs am: 36785ff4bd\nam: b6f51341e8\n\n* commit \u0027b6f51341e8bb34de8dfdc2694599c7090971fdf8\u0027:\n Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\n\nChange-Id: I323752b6f1f51a659af0aa84e7305c75ccbf0552\n" }, { "commit": "b6f51341e8bb34de8dfdc2694599c7090971fdf8", "tree": "7d9c6180cde3fced373e81ef4e33be4defd05843", "parents": [ "4f68b78406fc05f56e9a23b1cb937765be0499c7", "36785ff4bda29f8055864e081012e12077509889" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 17:49:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 17:49:59 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs\nam: 36785ff4bd\n\n* commit \u002736785ff4bda29f8055864e081012e12077509889\u0027:\n Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\n\nChange-Id: I9f50650cb3d52ba76aa61a28b9bf3aef36682d83\n" }, { "commit": "36785ff4bda29f8055864e081012e12077509889", "tree": "8f46a6572be2390efac72b4c46684bb36920bf08", "parents": [ "d13d50d881d66d0e870170c19a4e07ffe8aee742", "229f2a6dadcf584aeadfabc248d3b96d60aa18ce" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu May 19 17:22:56 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 17:22:57 2016 +0000" }, "message": "Merge \"Revert \"docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31\"\" into lmp-docs" }, { "commit": "a0a34f6017287d466e90a27f82ff8cf4c91c0663", "tree": "c91ded3155bbaca844124450751d94675b5ff85c", "parents": [ "522787f39a759cf8af8438641fa8df7470a1b959", "51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a" ], "author": { "name": "Billy Lamberta", "email": "blamberta@google.com", "time": "Mon May 16 22:19:41 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 16 22:19:41 2016 +0000" }, "message": "Merge \"docs: work minisite\" into mnc-io-docs am: 8f740bea13\nam: 51ceb1bad1\n\n* commit \u002751ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a\u0027:\n docs: work minisite\n\nChange-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242\n" }, { "commit": "51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a", "tree": "01c0da29d9f86cc111e3cc1663a90732c748c3d3", "parents": [ "8804495bffbbffa0abe8cd148ba1ea3c58e20be0", "8f740bea131ca0234fee9dce273f23c6f21ddf2f" ], "author": { "name": "Billy Lamberta", "email": "blamberta@google.com", "time": "Mon May 16 22:12:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 16 22:12:37 2016 +0000" }, "message": "Merge \"docs: work minisite\" into mnc-io-docs\nam: 8f740bea13\n\n* commit \u00278f740bea131ca0234fee9dce273f23c6f21ddf2f\u0027:\n docs: work minisite\n\nChange-Id: Id0a4c1be427a131f1766f3452bca1b2f90365981\n" }, { "commit": "e1277eb819b9eee3612e2cedba55d7cfb5e9c5e7", "tree": "03f397f4d9a2103cb1c9a99c49c5886e2a36ccd2", "parents": [ "0c5c9747a71bbb33ebf20ecc1f599a60a58238af" ], "author": { "name": "Billy Lamberta", "email": "blamberta@google.com", "time": "Tue May 03 16:23:59 2016 -0700" }, "committer": { "name": "Billy Lamberta", "email": "blamberta@google.com", "time": "Mon May 16 13:36:55 2016 -0700" }, "message": "docs: work minisite\n\nAdds minisite at docs/html/work. Adds landing page and\nAndroid for Work specific guides. Moves docs from\ntraining/enterprise and add redirects. Update resource\ncard info and add new images. Update sitemap, _book, and\nadd sidebar navigation menu.\n\nbug: 27744376\nChange-Id: Ib09f7fc6352dfde7a60fc674b06488c651b196e2\n" }, { "commit": "e9746f7a6a17222162625565db197ae52bce0be6", "tree": "91cc63b227f9828176480c45ea4e961b83a68b8d", "parents": [ "c87446f5a8c75598bcc79e9400eaaf4839e105c4", "6c568e632242e99eb255f721edcbec0223f9934d" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Sun May 15 03:11:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun May 15 03:11:46 2016 +0000" }, "message": "Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1\nam: 6c568e6322\n\n* commit \u00276c568e632242e99eb255f721edcbec0223f9934d\u0027:\n Update links for all files under sdk/ that moved to studio/\n\nChange-Id: I2acd1acd6fef98c527ef4dfc0d016bb5cfa296cc\n" }, { "commit": "6c568e632242e99eb255f721edcbec0223f9934d", "tree": "b18699d4c242c5412a4d283fa8c9e5c7b6ad2fff", "parents": [ "cf3fa15b3ea686daeedffb76712f2ec43651a354", "d10e0132a124f5a24bec436600e04b8f97720e7e" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Sun May 15 03:09:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun May 15 03:09:06 2016 +0000" }, "message": "Update links for all files under sdk/ that moved to studio/ am: 89d11705a1\nam: d10e0132a1\n\n* commit \u0027d10e0132a124f5a24bec436600e04b8f97720e7e\u0027:\n Update links for all files under sdk/ that moved to studio/\n\nChange-Id: If4a364fecbbb012f5b6beb739d879b003f90e6d9\n" }, { "commit": "89d11705a19f73d32a7e604477dd4358dc04d051", "tree": "faf929cde5cf00d01a4b6805eb1562dc67b9aef6", "parents": [ "7d1717b0a90d4ee5f7abcd89f5345a5a613d72e1" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Sat May 14 19:20:00 2016 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Sun May 15 02:55:23 2016 +0000" }, "message": "Update links for all files under sdk/ that moved to studio/\n\nChange-Id: I624621dfd7df0f441d0b559e5a12029e5e299964\n" }, { "commit": "90fa73b6d6731d3696fe43794274d131ac884fc2", "tree": "6abdd8141c5d6b868931215d27cf2c519989fd92", "parents": [ "e89dc40706f325e039de7dd6714223908dfb9b17", "e60af6b9e2645144cda30c5e54a1267f05ac1d0d" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri May 13 17:20:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 17:20:42 2016 +0000" }, "message": "Merge \"docs: App Translation API updates\" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008\nam: e60af6b9e2\n\n* commit \u0027e60af6b9e2645144cda30c5e54a1267f05ac1d0d\u0027:\n docs: App Translation API updates\n\nChange-Id: Idc2ad381a5105b6502f3c37b08ec30ebbf6568eb\n" }, { "commit": "e60af6b9e2645144cda30c5e54a1267f05ac1d0d", "tree": "18f49631c5a8fd83317d29d73223dd6c6d776f23", "parents": [ "95d6fa6b5d594951b6ce49f690792184d5ef8e72", "70f2e3900830f58cd8b4644319ba7e173c49f7c3" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Fri May 13 17:17:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 17:17:53 2016 +0000" }, "message": "Merge \"docs: App Translation API updates\" into mnc-docs am: 1ede811143 am: ec6effa1b0\nam: 70f2e39008\n\n* commit \u002770f2e3900830f58cd8b4644319ba7e173c49f7c3\u0027:\n docs: App Translation API updates\n\nChange-Id: Id1b10da621def8add8384011755a8a7061e06ff0\n" }, { "commit": "ec6effa1b0c7381f5d29a5b87d9bef53516dda4e", "tree": "1fd41405a3beb98425849fb789d7414972c958db", "parents": [ "96762b8500166d931bbb8d5e6193c841540bdec8", "1ede811143d32afe8ba6ce49a19060da4a1b6092" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Fri May 13 17:11:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 13 17:11:08 2016 +0000" }, "message": "Merge \"docs: App Translation API updates\" into mnc-docs\nam: 1ede811143\n\n* commit \u00271ede811143d32afe8ba6ce49a19060da4a1b6092\u0027:\n docs: App Translation API updates\n\nChange-Id: Id075bdfddf3c5ccabf063690a37c487a87f9635d\n" }, { "commit": "8363a70024a53f4934639a1e6c13aae17f4d6d0c", "tree": "ed496668a7840bc3cf9b19bc296dacba29297f1a", "parents": [ "341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a", "dc4cd59183fec0d5dc5661e6015f856f66d65ce9" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu May 12 18:48:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 12 18:48:50 2016 +0000" }, "message": "Merge \"docs: Noted that custom permissions must be unique per-device\" into mnc-mr-docs am: 9be023f077 am: 76f95f5571\nam: dc4cd59183\n\n* commit \u0027dc4cd59183fec0d5dc5661e6015f856f66d65ce9\u0027:\n docs: Noted that custom permissions must be unique per-device\n\nChange-Id: Ieaef597484008d63ce1660f89d50c8cd1515f9ed\n" }, { "commit": "dc4cd59183fec0d5dc5661e6015f856f66d65ce9", "tree": "7bb372795fc8d54e0e66b858df5d89229e659bef", "parents": [ "9b22357c098963fb791ee86434b31fab0d8523d2", "76f95f557129a583a52b8d7c896510fc3e2e02e8" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu May 12 18:46:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 12 18:46:17 2016 +0000" }, "message": "Merge \"docs: Noted that custom permissions must be unique per-device\" into mnc-mr-docs am: 9be023f077\nam: 76f95f5571\n\n* commit \u002776f95f557129a583a52b8d7c896510fc3e2e02e8\u0027:\n docs: Noted that custom permissions must be unique per-device\n\nChange-Id: I16fb362316afee6e6a4565184ef1c9798e1530be\n" }, { "commit": "ad87d2beaf83a02f538864acae09336d4c11a0a2", "tree": "2ead48bfcc451148fcb1f42d4c2294e7b48580ec", "parents": [ "51b3a0a016353c733d4ebfc1cc9d8273a840628b" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Apr 15 14:58:42 2016 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Wed May 11 15:23:53 2016 -0700" }, "message": "docs: Noted that custom permissions must be unique per-device\n\nWe\u0027d already noted this in the \"new in Android 5.0\" page but we\nhadn\u0027t moved this into the base \"permissions\" pages. Added it, with\nsome usage recommendations from the bug.\n\nAlso fixed some formatting while I had the files open.\n\nSee first comment for doc stage location.\n\nbug: 18143176\nChange-Id: I9cc1a8865492ebf30c7a0f7c325669ded670933e\n" }, { "commit": "5310e2d6698cd7b59bea9e363cf0b7e67dcbc494", "tree": "e6be358fddf2dd27aa6a3bae9e23e842d61f82a4", "parents": [ "c522dc65c419145119217bfa6bfae127afe0829d" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Tue Apr 12 12:35:56 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri May 06 10:30:56 2016 -0700" }, "message": "docs: App Translation API updates\n\nIncludes all updates to App Translation API content/text. Also\nincludes \"Related Resource\" cards.\n\nBug: 27729402\n\nChange-Id: I0385f448b7b92fe420f3b51394d9a659e7b6df81\nOriginal-Change-Id: Ibcde400fe8b340f032d1c458c83deb828450c9a5\n" }, { "commit": "6f9f75e1063d282c933ede862fa7ea9371a2f310", "tree": "dc646e0d24cf8bea0ddc0a170d04bff95e207692", "parents": [ "f28b23416eb607734d255b0c5595674ee3b7b949", "35515f4fdb9e0c5ae4618a8b55addd2e24cf6983" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu May 05 01:01:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 05 01:01:58 2016 +0000" }, "message": "docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd\nam: 35515f4fdb\n\n* commit \u002735515f4fdb9e0c5ae4618a8b55addd2e24cf6983\u0027:\n docs: Fixing bad URL in libraries TOC\n\nChange-Id: I930f38f695dc831983afc414799cbfc9398ff867\n" }, { "commit": "35515f4fdb9e0c5ae4618a8b55addd2e24cf6983", "tree": "cc15ce0549f1c928e42828353b91f416be776bc6", "parents": [ "b3a82cff5ab8fbe5930b05a1b150e44f87b25a29", "d9092978cde2bfdb291c5a5edbec4c28404a8e0d" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu May 05 00:59:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 05 00:59:37 2016 +0000" }, "message": "docs: Fixing bad URL in libraries TOC am: 084d99bfd4\nam: d9092978cd\n\n* commit \u0027d9092978cde2bfdb291c5a5edbec4c28404a8e0d\u0027:\n docs: Fixing bad URL in libraries TOC\n\nChange-Id: I25103954c34a912c75e9cbbda01aeb007f03b410\n" }, { "commit": "084d99bfd4938689e6394a8f3bcb5d261b852f93", "tree": "00431d0799d14792adfc3703f013bf3d5a9e61e7", "parents": [ "60e5bc30bbb41f25836a8bbd2a04bc2eab4b7f8c" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Wed May 04 15:31:24 2016 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Wed May 04 16:20:01 2016 -0700" }, "message": "docs: Fixing bad URL in libraries TOC\n\nAlso added the libraries sub-TOC to the \"API Guides\" TOC.\n\nSee first comment for doc stage location.\n\nChange-Id: I06aac939e40ffad7888801ea01f6d4decd6eb4d1\n" }, { "commit": "a75f01557cb3299de69ae856a06e824535de6e39", "tree": "0b4ce7e4f21732d2622ad2c39c385909d6811321", "parents": [ "9a2384a7a6ad4ff630f125e844f7b202ec3cc649", "99dfd4c92f13f9fe024fe995261bcfdd8bd61295" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Wed May 04 18:30:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 18:30:17 2016 +0000" }, "message": "Merge \"docs: Renaming /go/ top-level directory to /topic/\" into mnc-mr-docs am: 6006856b24 am: 5c197a1513\nam: 99dfd4c92f\n\n* commit \u002799dfd4c92f13f9fe024fe995261bcfdd8bd61295\u0027:\n docs: Renaming /go/ top-level directory to /topic/\n\nChange-Id: Ie817cd75f56e9bc8d5080711d0cb7de6887541aa\n" }, { "commit": "99dfd4c92f13f9fe024fe995261bcfdd8bd61295", "tree": "ea0d0f9966bca3234550f5a6c610bb44d985224f", "parents": [ "ad6af19b1b99a9cd5b8f2db6010532f19d38aae2", "5c197a1513a1a3b181977c6425a0f542d770a1bc" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Wed May 04 18:23:07 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 18:23:07 2016 +0000" }, "message": "Merge \"docs: Renaming /go/ top-level directory to /topic/\" into mnc-mr-docs am: 6006856b24\nam: 5c197a1513\n\n* commit \u00275c197a1513a1a3b181977c6425a0f542d770a1bc\u0027:\n docs: Renaming /go/ top-level directory to /topic/\n\nChange-Id: I1a49367d42f2d16e0b3c9c9f41bb844a00052490\n" }, { "commit": "6006856b24335473e71a58d3bf45d49c57ea6055", "tree": "a236e775e3a6a9403771cf840fffe61d9e73e331", "parents": [ "3548f40a28722750dc581414f329b6741502fb6a", "f33272d531955d6eca3795dc1c00f6fb9b88a457" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Wed May 04 18:07:08 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 04 18:07:10 2016 +0000" }, "message": "Merge \"docs: Renaming /go/ top-level directory to /topic/\" into mnc-mr-docs" }, { "commit": "cda3cab8dd35f802e8d0ded415545123e5444b38", "tree": "ce49f56bf6e0fd5fbd7940f90d4ed3ce1798a0ab", "parents": [ "be1cd9f5ce6eb2bc37b15258c6ab22e2fc5592e1", "3c523f65a87f8fd0f30ea41ac205687111b218ea" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Wed May 04 00:34:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 00:34:33 2016 +0000" }, "message": "Merge \"Fix documentation for drawable resource\" into mnc-docs am: 2d542c5558 am: d3eacb56b6 am: 7179b0b52f\nam: 3c523f65a8\n\n* commit \u00273c523f65a87f8fd0f30ea41ac205687111b218ea\u0027:\n Fix documentation for drawable resource\n\nChange-Id: Ia726bfeb247b212fadfb07f6e241295d07f16256\n" }, { "commit": "3c523f65a87f8fd0f30ea41ac205687111b218ea", "tree": "a2c4e31bfa167ecaf8ad1903f9215ca3060c65b9", "parents": [ "e105e8faced5b9528421efc48e4ec26e4f487aae", "7179b0b52f64a5838cc367fea9407ec120b4fd2e" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Wed May 04 00:29:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 00:29:25 2016 +0000" }, "message": "Merge \"Fix documentation for drawable resource\" into mnc-docs am: 2d542c5558 am: d3eacb56b6\nam: 7179b0b52f\n\n* commit \u00277179b0b52f64a5838cc367fea9407ec120b4fd2e\u0027:\n Fix documentation for drawable resource\n\nChange-Id: Ic66e603345daf1c915939330a3f4cac52787610e\n" }, { "commit": "d3eacb56b6918804ef6c8542fe264656c03f1708", "tree": "7239d906fc7dce7e5e0d7299c97a695e68e75082", "parents": [ "e4f02996b50f1b5635f760e8e3240f33365ac3ef", "2d542c555851d896ceecb0e7a51819fef4f2cfbd" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Wed May 04 00:16:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 00:16:44 2016 +0000" }, "message": "Merge \"Fix documentation for drawable resource\" into mnc-docs\nam: 2d542c5558\n\n* commit \u00272d542c555851d896ceecb0e7a51819fef4f2cfbd\u0027:\n Fix documentation for drawable resource\n\nChange-Id: Idc27783a9b237dbba23f548ecdde89df32acec8b\n" }, { "commit": "f33272d531955d6eca3795dc1c00f6fb9b88a457", "tree": "05bc1ca40ddc2e590d8d1ee74d2a745b6046c7bb", "parents": [ "cf4fe3c46d163a6f26b5a7dcdcaf56352e4b0bcd" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Tue May 03 11:41:07 2016 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Tue May 03 16:48:31 2016 -0700" }, "message": "docs: Renaming /go/ top-level directory to /topic/\n\nPer discussion with JF and DD, the new holding pen for not-quite-\ntop-level topics will be a \"/topic/\" directory, not \"/go/\". (Currently\nthe only thing living there is the new \"libraries\" section.)\n\nUpdating redirects and TOCs accordingly. See first comment for\ndoc stage location.\n\nbug: 28558659\n\nChange-Id: I09201a8334cac70d76559a106a74d5a29fe82128\n" }, { "commit": "5d980120003f3ab2c7b614e3eaa76927ff170567", "tree": "4a70e44efe678f401e7efa966ff56cb9ad31b80e", "parents": [ "15eb965696806c5f18d2521bf9ad6065b1400a48" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Mon May 02 11:31:16 2016 +0900" }, "committer": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Tue May 03 05:14:01 2016 +0000" }, "message": "Fix documentation for drawable resource\n\nChange-Id: Ic7cd4dd75dc75c26184b71049589588fe658a9a3\n" }, { "commit": "98a418758dcde8fd2ce63d5a489487fdd371fed9", "tree": "e567860c95521c484a1be28dd455611d92aecb3f", "parents": [ "05be517fb77260c4aa8d4e803a860b110833b6ab", "1bfe7f6c658dc279e36049ca5cc566c673d84b34" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Apr 29 00:13:41 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 29 00:13:42 2016 +0000" }, "message": "Merge \"Add Complex XML Resources guide to docs\" into nyc-dev" }, { "commit": "bc0b8ca0dfbabf899ef81e8ca2c99c18b20509b4", "tree": "d094fc3a1ff20e58385991de60b0d41ab856f9d0", "parents": [ "1fe7ed557de90c6992f6d36a485cd63b651a51dd", "4290ad19e2b96887b88a08e8e39629b34d4d4117" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu Apr 28 20:59:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 20:59:50 2016 +0000" }, "message": "docs: Moving library docs out of /tools/ am: 7877f69ddd am: 6bbce8db4f\nam: 4290ad19e2\n\n* commit \u00274290ad19e2b96887b88a08e8e39629b34d4d4117\u0027:\n docs: Moving library docs out of /tools/\n\nChange-Id: I3f42ace3cce49c0d66cc51607c6b7bf182a445c2\n" }, { "commit": "4290ad19e2b96887b88a08e8e39629b34d4d4117", "tree": "6b664ac297f6c8b3f1b653b2b48bbad06ea7e318", "parents": [ "37b8afbbc238ea115a2642d9826fdc6f8f3100c9", "6bbce8db4fd9d4fe5d56fb7eb17793f0c8ac7294" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu Apr 28 20:57:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 20:57:26 2016 +0000" }, "message": "docs: Moving library docs out of /tools/ am: 7877f69ddd\nam: 6bbce8db4f\n\n* commit \u00276bbce8db4fd9d4fe5d56fb7eb17793f0c8ac7294\u0027:\n docs: Moving library docs out of /tools/\n\nChange-Id: I89594b6fc16e8d14aac5825f7f05b7cf928ffb69\n" }, { "commit": "7877f69ddd5f195829a54df256a0f1215cf124ec", "tree": "01f28bcac86e610b9011fafb2f504b377ee525fb", "parents": [ "a872460fd31c2cffde6ed467a43099590ad8aa7f" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Tue Apr 26 16:00:59 2016 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu Apr 28 13:36:06 2016 -0700" }, "message": "docs: Moving library docs out of /tools/\n\nThe /tools/ top-level directory is going away when we move to devsite\n(and the Android Studio docs get their own home) so I\u0027m moving the\nnon-AS docs out of there. Also adding redirects (and fixing redirects\nthat pointed to the old locations).\n\nFor the time being, I\u0027m also adding these libraries in to the\n\"API Guides\" TOC, just so they\u0027re discoverable from somewhere; I\u0027m\nexpecting this to change post-redesign.\n\nSee first comment for doc stage location.\n\nbug: 28270787\nChange-Id: I07488251384fbd22d2512a797793cf98654f54e7\n" }, { "commit": "1bfe7f6c658dc279e36049ca5cc566c673d84b34", "tree": "0b5ae0c481b34bae84370e4be4d296995b41ee24", "parents": [ "28d6c1e49313bcb4823541d0114b2ff04f8cb446" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Apr 26 15:44:57 2016 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Apr 28 13:21:23 2016 -0700" }, "message": "Add Complex XML Resources guide to docs\n\nBug:27101564\nChange-Id: I701230a242e0ec6c4cea2808556f9b1054866612\n" }, { "commit": "72403f1daa03eba6a2169eb97c2c1fdadba2c292", "tree": "bb68f6162a74bfac90c6b7b0fb154b93f3cc928c", "parents": [ "08c4dfba82fff75a2530bf8c694a40b306f8396e", "26d957c9c1903fc4f520de8b56cc57539ac33b3a" ], "author": { "name": "Elliot Waite", "email": "elliotwaite@google.com", "time": "Thu Apr 28 18:50:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 18:50:37 2016 +0000" }, "message": "Merge \"Change custom_link_attributes to path_attributes format.\" into mnc-mr-docs am: 14fd7d5 am: 5b4f351\nam: 26d957c\n\n* commit \u002726d957c9c1903fc4f520de8b56cc57539ac33b3a\u0027:\n Change custom_link_attributes to path_attributes format.\n\nChange-Id: I5dfd8ee64fbf6502e29d639d454d6b637ecf2e12\n" }, { "commit": "26d957c9c1903fc4f520de8b56cc57539ac33b3a", "tree": "c18451d996427d70571c64dfd904b8c60521f8c9", "parents": [ "8a1eb90d96f3a69fea72f6599507a31d0fc356e9", "5b4f351e43cc50bc263ff30099fa7733093e63c6" ], "author": { "name": "Elliot Waite", "email": "elliotwaite@google.com", "time": "Thu Apr 28 18:46:52 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 18:46:52 2016 +0000" }, "message": "Merge \"Change custom_link_attributes to path_attributes format.\" into mnc-mr-docs am: 14fd7d5\nam: 5b4f351\n\n* commit \u00275b4f351e43cc50bc263ff30099fa7733093e63c6\u0027:\n Change custom_link_attributes to path_attributes format.\n\nChange-Id: Ica8216729362289cc7ccc14c1290d8be9f05fb01\n" }, { "commit": "988248daabd2a9c96c516e4e1187c70e36b8f352", "tree": "79e6d685c7540c28e38bd8405e4d9392eee02ce8", "parents": [ "55ba523a631949d90cd9e613c140ebca1c01b44d" ], "author": { "name": "Elliot Waite", "email": "elliotwaite@google.com", "time": "Tue Apr 26 19:46:39 2016 -0700" }, "committer": { "name": "Elliot Waite", "email": "elliotwaite@google.com", "time": "Wed Apr 27 20:07:57 2016 -0700" }, "message": "Change custom_link_attributes to path_attributes format.\n\nChange-Id: I24439d6f9226ace37eab875e8b1bb634a9e52074\n" }, { "commit": "27076c7bfcbe8623e608d31f8697241ee6855508", "tree": "03be37536424d5170d1f3991658df18fef787a20", "parents": [ "526c6dd8c3b84ed1905d4d03aef1daad910d6305", "0e5d260ae793a42efc974c0674a530f808d7f05a" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Apr 27 05:40:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 27 05:40:59 2016 +0000" }, "message": "Merge \"docs: [Revert] Improved description of \"package\" attribute (manifest).\" into mnc-mr-docs am: fa8847d am: ee3411d\nam: 0e5d260\n\n* commit \u00270e5d260ae793a42efc974c0674a530f808d7f05a\u0027:\n docs: [Revert] Improved description of \"package\" attribute (manifest).\n\nChange-Id: I336b8fa0787934813004b8c3b322a408635c6c87\n" }, { "commit": "096e5a807ffaf50eb3413b72c8ca5174dd0ea139", "tree": "948d1470908de566b20dc35ee21035d520b39211", "parents": [ "48a4930ef6d19191b379170b21fe5dce52c91c32", "7e8840dec7879e2973ebf1e09c74a482c1ee8651" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Apr 27 05:40:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 27 05:40:13 2016 +0000" }, "message": "Merge \"docs: Improved description of \"package\" attribute (manifest).\" into mnc-mr-docs am: 190bf3b943 am: 19db30b\nam: 7e8840d\n\n* commit \u00277e8840dec7879e2973ebf1e09c74a482c1ee8651\u0027:\n docs: Improved description of \"package\" attribute (manifest).\n\nChange-Id: I8ea2623afea04cc3f5c5b9550fc66cb42d79a5d2\n" }, { "commit": "6c3822ef5a25b1351aba5a66ee26768344ca214d", "tree": "74a995f74ac4779540c84c80911e6edbceb6ae74", "parents": [ "4d8062e1c1a294289f7c7113f87e2552c720566c", "b79b80882c34f0c540e84c7a3a90b73c617e0635" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Wed Apr 27 03:11:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 27 03:11:53 2016 +0000" }, "message": "Merge \"docs: InfoPros, Project 02, Batch 03\" into mnc-mr-docs am: d00f005 am: 94e5237\nam: b79b808\n\n* commit \u0027b79b80882c34f0c540e84c7a3a90b73c617e0635\u0027:\n docs: InfoPros, Project 02, Batch 03\n\nChange-Id: Iccf5c61e7c9a7da81d8df114076a94a86983e247\n" }, { "commit": "4d8062e1c1a294289f7c7113f87e2552c720566c", "tree": "2de7dc88ce2ead1c42ca536fc89d89b5cdf6fc24", "parents": [ "3adc5cbdf9bed5f803353607323efcbff09d507b", "54bf9464697af53381af5bf8f980f3a3336b4369" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Wed Apr 27 03:09:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 27 03:09:25 2016 +0000" }, "message": "docs: Remove texture compression formats that don\\\u0027t exist am: 2112afe am: 8d949de\nam: 54bf946\n\n* commit \u002754bf9464697af53381af5bf8f980f3a3336b4369\u0027:\n docs: Remove texture compression formats that don\u0027t exist\n\nChange-Id: I9b572855315a34db894dfea4ae808769890c97df\n" }, { "commit": "0e5d260ae793a42efc974c0674a530f808d7f05a", "tree": "1a485206b4a03a523d4fd282ee57e10c38cdef41", "parents": [ "d88a3caddb34aed7bef5a7d01f62164eacbcbbb0", "ee3411d94bda3a091f1ba69dfcd7efa12d3e13f3" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Tue Apr 26 08:50:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 26 08:50:48 2016 +0000" }, "message": "Merge \"docs: [Revert] Improved description of \"package\" attribute (manifest).\" into mnc-mr-docs am: fa8847d\nam: ee3411d\n\n* commit \u0027ee3411d94bda3a091f1ba69dfcd7efa12d3e13f3\u0027:\n docs: [Revert] Improved description of \"package\" attribute (manifest).\n\nChange-Id: Ia6f54070f06eace4014e62a3a20ce9befd2eccc3\n" }, { "commit": "7e8840dec7879e2973ebf1e09c74a482c1ee8651", "tree": "ea843d3009523f59853359b8e208828dec9fe2af", "parents": [ "3c8a59fc25e7d1bd777f15ef9712696b341e2a49", "19db30bc49de27090422ad985eb69bace3aebeec" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Tue Apr 26 08:50:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 26 08:50:22 2016 +0000" }, "message": "Merge \"docs: Improved description of \"package\" attribute (manifest).\" into mnc-mr-docs am: 190bf3b943\nam: 19db30b\n\n* commit \u002719db30bc49de27090422ad985eb69bace3aebeec\u0027:\n docs: Improved description of \"package\" attribute (manifest).\n\nChange-Id: I90fa4b675592889fd9252e6bdaff24965fc48046\n" }, { "commit": "b79b80882c34f0c540e84c7a3a90b73c617e0635", "tree": "e66d850c51f49d838c91f08e48c4a7e490a1f46d", "parents": [ "54bf9464697af53381af5bf8f980f3a3336b4369", "94e52371b1512ec7248856bc369d52db4887cedc" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Tue Apr 26 07:52:52 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 26 07:52:52 2016 +0000" }, "message": "Merge \"docs: InfoPros, Project 02, Batch 03\" into mnc-mr-docs am: d00f005\nam: 94e5237\n\n* commit \u002794e52371b1512ec7248856bc369d52db4887cedc\u0027:\n docs: InfoPros, Project 02, Batch 03\n\nChange-Id: I7b25fca6d54a0729881c6918b7e020ee1b182594\n" }, { "commit": "54bf9464697af53381af5bf8f980f3a3336b4369", "tree": "bb746942c42ba23b0cdb67cee6dfef86162dc71e", "parents": [ "33b03aea27af14f6dce4fa535a0d68995dd9a32e", "8d949de289355c67c9279cb3770630b5da3e3672" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Tue Apr 26 07:51:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 26 07:51:37 2016 +0000" }, "message": "docs: Remove texture compression formats that don\\\u0027t exist am: 2112afe\nam: 8d949de\n\n* commit \u00278d949de289355c67c9279cb3770630b5da3e3672\u0027:\n docs: Remove texture compression formats that don\u0027t exist\n\nChange-Id: I2e0c96be826709daf6c9f8f3478bb3e1a2719479\n" }, { "commit": "bdc74232d19e4aa3375c529344fe462fbe98b99e", "tree": "3a446d0e6607b00fb564c419c5079189cf6a7588", "parents": [ "190bf3b943597e28a6d42da88b417c57073bad43" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri Apr 15 15:00:55 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Tue Apr 19 18:33:12 2016 -0700" }, "message": "docs: [Revert] Improved description of \"package\" attribute\n(manifest).\n\nPer discussion with ddougherty@, decided that this was a high-risk,\nlow-reward change. Have \"undone\" the change with the given\n\"Original-Change-Id\" as a result.\n\nBug: 2735276\nChange-Id: I1f6089a1319180aed7d6fdbcf182c5fbe4b49abb\nOriginal-Change-Id: Ifa30615c1cca5f6f19e4d1d0c071e4e256b3151b\n" }, { "commit": "682c24e22811d4ee17ae1cd61bf255c3f7e722b7", "tree": "14ae11892022b653871ede366b09277254704f5a", "parents": [ "65136ac6a4f6fb2423a0768b451782dcd0e960d5" ], "author": { "name": "Trevor Johns", "email": "trevorjohns@google.com", "time": "Tue Apr 12 10:13:47 2016 -0700" }, "committer": { "name": "Trevor Johns", "email": "trevorjohns@google.com", "time": "Tue Apr 19 02:03:59 2016 -0700" }, "message": "Resolve merge conflicts of a5060ee to nyc-dev\n\nThis undoes the automerger skip which occured in\ncommit e740c84dc32180214a7fd157105d6c18d30408ee and\nreplays it as a standard (NOT -s ours) merge.\n\nChange-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086\n" }, { "commit": "8998fe68b1f20042e5a648ac77bc3ba857c7f2b2", "tree": "b6a4c5c5722a11e91a6017faeacef6948d383268", "parents": [ "1938352589f72f6a790da743266ea1a239cd797d" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri Apr 15 15:00:55 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri Apr 15 15:00:55 2016 -0700" }, "message": "docs: Improved description of \"package\" attribute (manifest).\n\nThe description of the \"package\" attribute for an Android\napplication\u0027s \u003cmanifest\u003e element now states more clearly that the\nAndroid package name and the Java package name(s) used in the app\u0027s\nclasses do not need to be the same.\n\nBug: 2735276\nChange-Id: Ifa30615c1cca5f6f19e4d1d0c071e4e256b3151b\n" }, { "commit": "2df5ba777a6ad271b1af6d9ef18d79e2aca5f105", "tree": "9d5a66033c27c74c165bff88418078366a82f271", "parents": [ "390a81302f13a0285e58e550cf786255ce5f8bd8" ], "author": { "name": "Chad Brubaker", "email": "cbrubaker@google.com", "time": "Mon Apr 11 13:31:24 2016 -0700" }, "committer": { "name": "Chad Brubaker", "email": "cbrubaker@google.com", "time": "Tue Apr 12 11:07:51 2016 -0700" }, "message": "Document when usesCleartextTraffic is ignored.\n\nIn N and above when using an Android Network Security Config the\ncleartext configuration from that is used and\nandroid:usesCleartextTraffic in the manifest is ignored.\n\nBug:27596429\nChange-Id: I50ec765cead6cfd6bbaec585723f99d72e0fd945\n" }, { "commit": "d00f0050493cfdfacb0b04c3210d2eabf2144b4e", "tree": "ea8b205f5037eae51b967b0f764e740e1996995f", "parents": [ "2112afe75c72e34cc57fbc91e3a0014dda1611be", "7adb4c8a45772c380defdd4e6b42a95c0ceea1e6" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Mon Apr 11 16:24:35 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 11 16:24:36 2016 +0000" }, "message": "Merge \"docs: InfoPros, Project 02, Batch 03\" into mnc-mr-docs" }, { "commit": "7adb4c8a45772c380defdd4e6b42a95c0ceea1e6", "tree": "ec7ded30e68a2856bacad8a13a776df678475770", "parents": [ "f70f0f4eaa79de64a8c450e5654c90976b35eec6" ], "author": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Mon Mar 28 10:04:57 2016 -0700" }, "committer": { "name": "Joe Fernandez", "email": "joefernandez@google.com", "time": "Mon Apr 11 09:21:03 2016 -0700" }, "message": "docs: InfoPros, Project 02, Batch 03\n\n- Removing API 15 and lower work-arounds\n\nb/26490262\n\nChange-Id: Ie8ca92bbff68ca3bc67d2b81164d970058a8a8a8\n" }, { "commit": "2112afe75c72e34cc57fbc91e3a0014dda1611be", "tree": "56499be42a5eec426ef46ffc5b69d50c4f8c1a8a", "parents": [ "1452c87b1acf496abe5ce8f90177ce635f955e16" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Sat Apr 09 21:01:39 2016 -0700" }, "committer": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Sat Apr 09 21:01:39 2016 -0700" }, "message": "docs: Remove texture compression formats that don\u0027t exist\n\nBug: 27906767\nChange-Id: Ifb3d7f0455a4349e76727c497d52f3d0d5fa8838\n" }, { "commit": "a5060ee80dbb48bd7fc545d2aeeeb657b79893ea", "tree": "842bb82e198dccade4bfb3ceafcc01f96083cd34", "parents": [ "ebf3261aa6d80ad4ca1df0fd0509961ff7a1914e", "9577d31b10aa654d3ba63947e7733945a358395e" ], "author": { "name": "Trevor Johns", "email": "trevorjohns@google.com", "time": "Tue Apr 05 19:43:35 2016 -0700" }, "committer": { "name": "Trevor Johns", "email": "trevorjohns@google.com", "time": "Tue Apr 05 20:32:07 2016 -0700" }, "message": "Merge branch \u0027mnc-mr-docs\u0027 into mnc-ub-dev\n\nLarge merge to reconnect automerger for docs branch to mainline.\n\n Conflicts:\n\tdocs/html-intl/intl/es/index.jd\n\tdocs/html-intl/intl/es/preview/download.jd\n\tdocs/html-intl/intl/es/preview/index.jd\n\tdocs/html-intl/intl/ja/index.jd\n\tdocs/html-intl/intl/ja/preview/download.jd\n\tdocs/html-intl/intl/ja/preview/index.jd\n\tdocs/html-intl/intl/ko/index.jd\n\tdocs/html-intl/intl/ko/preview/download.jd\n\tdocs/html-intl/intl/ko/preview/index.jd\n\tdocs/html-intl/intl/pt-br/index.jd\n\tdocs/html-intl/intl/pt-br/preview/download.jd\n\tdocs/html-intl/intl/pt-br/preview/index.jd\n\tdocs/html-intl/intl/ru/index.jd\n\tdocs/html-intl/intl/ru/preview/download.jd\n\tdocs/html-intl/intl/ru/preview/index.jd\n\tdocs/html-intl/intl/zh-cn/index.jd\n\tdocs/html-intl/intl/zh-cn/preview/download.jd\n\tdocs/html-intl/intl/zh-cn/preview/index.jd\n\tdocs/html-intl/intl/zh-tw/index.jd\n\tdocs/html-intl/intl/zh-tw/preview/download.jd\n\tdocs/html-intl/intl/zh-tw/preview/index.jd\n\tdocs/html/guide/topics/manifest/compatible-screens-element.jd\n\tdocs/html/guide/topics/manifest/uses-feature-element.jd\n\tdocs/html/preview/download.jd\n\tdocs/html/preview/features/runtime-permissions.jd\n\tdocs/html/sdk/index.jd\n\tdocs/html/tools/revisions/studio.jd\n\tdocs/html/tools/sdk/eclipse-adt.jd\n\tdocs/html/tools/support-library/features.jd\n\ttelephony/java/android/telephony/TelephonyManager.java\n\nBug: 28000173\nChange-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94\n" }, { "commit": "c9afecdff9d0828a9725ffac5c04f4ac5f50df9a", "tree": "c2c85cc30a9e16c469d2e4b8d992d1c6060cf163", "parents": [ "9deafe59e5737734aaf4cd65c14b2a22767baa46", "908d74a3b2ab1491bc191856f4ab54380573cd7d" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Thu Mar 31 15:14:10 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 31 15:14:12 2016 +0000" }, "message": "Merge \"docs: Corrected reference link for NotificationManager.notify().\" into mnc-mr-docs" }, { "commit": "88e19d16708d0e2c5e2724bdc5c5cc8240ab46c5", "tree": "fbc950cfd0d24d802a4fd42a3898f8dcd10ec449", "parents": [ "8ea3fd89c434bd8e6e2ce8542b4fc5e7936838e5", "d9ad75f5b0ddd0d379851fb47b15e137c8ff1b99" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Thu Mar 31 15:12:31 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 31 15:12:32 2016 +0000" }, "message": "Merge \"docs: Fixed Marshmallow links in API level table.\" into mnc-mr-docs" }, { "commit": "908d74a3b2ab1491bc191856f4ab54380573cd7d", "tree": "a5aec1d6b0640509e042b936465ff0ccf5b024f3", "parents": [ "d93472b72be8739d1af97fbc4dc29c0f7c4ef4e0" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Mar 30 14:35:57 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Mar 30 14:35:57 2016 -0700" }, "message": "docs: Corrected reference link for NotificationManager.notify().\n\nThe end of the first paragraph of the \"Creating a Notification\"\nsection (within the \"Notifications\" page) now links to the correct\nversion of notify() -- i.e. the one within the NotificationManager\nclass.\n\nBug: 27708810\nChange-Id: I7cc9608f646518bf5f7fc3f4a231c9dece693363\n" }, { "commit": "0f5e32d8eb869e11aae626a61dcc353adac77b20", "tree": "68423ad4cc52cf65e3da6e810c37aafaa89b4937", "parents": [ "840172ac1ecc514098d0cad41e009dab95542620", "ff7c8b9e9d28fa4fb4a5cd43ffc4ffae9b23706e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 30 19:41:04 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 30 19:41:05 2016 +0000" }, "message": "Merge \"Fix CRLF\" into nyc-dev" }, { "commit": "abb9f4db5a5166c066f58fa75cd61ac0b07a52a0", "tree": "b0d6884def0332ca9d962e9a90a89814cea0d237", "parents": [ "f2988f59f478e45ee2be5ad2934abd0baa8e1b39", "fe1d89f33929c7153fdd160c4072c256b53a481b" ], "author": { "name": "Elliot Waite", "email": "elliotwaite@google.com", "time": "Wed Mar 30 18:36:59 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 30 18:37:01 2016 +0000" }, "message": "Merge \"Change colons to equals for custom_link_attributes.\" into mnc-mr-docs" }, { "commit": "5278d00d1974534c9ce73c0c8d23a2a99edfb524", "tree": "8c5a0e9d9470f47b2a9ae969f1f0eeb0ce11e7b5", "parents": [ "994db1bb2c0f4a480d6361b5659906ba8f3cf26e" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Mar 29 14:49:09 2016 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Mar 30 10:02:29 2016 -0700" }, "message": "Fix typo in Conversion Functions doc\n\nBug: 27529815\n\n(cherry picked from commit b61a0dae0923f17089a894ea959a87a91cd12f9f)\n\nChange-Id: I401531a469f8ea01175d738e1cb4a02a064c9194\n" }, { "commit": "f2988f59f478e45ee2be5ad2934abd0baa8e1b39", "tree": "1dd31a3e9bdac7c96d4bb201cfeee0bee82bfe84", "parents": [ "f70f0f4eaa79de64a8c450e5654c90976b35eec6", "a51f9c0418ca7ed7abd6c9ebb71265c78301a633" ], "author": { "name": "Miao Wang", "email": "miaowang@google.com", "time": "Wed Mar 30 02:50:21 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 30 02:50:23 2016 +0000" }, "message": "Merge \"[RenderScript] Update documentation about API level and RS Support Lib.\" into mnc-mr-docs" }, { "commit": "a51f9c0418ca7ed7abd6c9ebb71265c78301a633", "tree": "73fb1c44f841df5efd825ab4cada5c0467059639", "parents": [ "d65cec19705dd495f6eed05c48f3fe18e63a4e6e" ], "author": { "name": "Miao Wang", "email": "miaowang@google.com", "time": "Tue Mar 29 14:41:42 2016 -0700" }, "committer": { "name": "Miao Wang", "email": "miaowang@google.com", "time": "Tue Mar 29 14:51:02 2016 -0700" }, "message": "[RenderScript] Update documentation about API level and RS Support Lib.\n\nBug: 22767853\n\n - Correct the description about renderscriptTargetApi: Use the lowest\n API level providing all the functionality in the code.\n - Update the sample gradle config to use the up-to-date and stable\n version of Build-Tools.\n\nChange-Id: Ie8008acafb270fda9e2c928953568461f6f6f476\n" }, { "commit": "b61a0dae0923f17089a894ea959a87a91cd12f9f", "tree": "190f908ecf155a34ea37049b9bed22b1c154aef1", "parents": [ "bdda585f862bd2880c98dabe1a981f9559d29662" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Mar 29 14:49:09 2016 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Mar 29 14:49:09 2016 -0700" }, "message": "Fix typo in Conversion Functions doc\n\nBug: 27529815\nChange-Id: I470348a232d9955d23463ec32c2de60abb44bc3f\n" }, { "commit": "d9ad75f5b0ddd0d379851fb47b15e137c8ff1b99", "tree": "9359b2c051e24396b7f844801eaaaf3a1d877a06", "parents": [ "2fb3d77b171ba5457c5e22787d85e86f116e6e48" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri Mar 25 09:46:54 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri Mar 25 16:42:34 2016 -0700" }, "message": "docs: Fixed Marshmallow links in API level table.\n\nThe table listing the different Android API levels (within the\n\"\u003cuses-sdk\u003e\" page) now contains accurate links for \"Android 6.0\" APIs\nand \"Platform Highlights.\"\n\nBug: 27725763\nChange-Id: I7cc9734b84ac530223a6bae58aed0072dcd214aa\n" }, { "commit": "fe1d89f33929c7153fdd160c4072c256b53a481b", "tree": "bf09448f18c08cb75bfae33faaa15ad011016307", "parents": [ "2fb3d77b171ba5457c5e22787d85e86f116e6e48" ], "author": { "name": "Elliot Waite", "email": "elliotwaite@google.com", "time": "Thu Mar 24 14:57:24 2016 -0700" }, "committer": { "name": "Elliot Waite", "email": "elliotwaite@google.com", "time": "Thu Mar 24 14:57:24 2016 -0700" }, "message": "Change colons to equals for custom_link_attributes.\n\nChange-Id: I9f4ca9d0df9e7b358af28ded8cf6d992e38a0650\n" }, { "commit": "d24382984d50650fcdfe7b58992350a1dedb55b1", "tree": "5de758b2d24660b3cb62eeab9c585d49d9e63463", "parents": [ "2bd66d68d80d1347e731aa0d645e9fddde4abdab" ], "author": { "name": "Janis Danisevskis", "email": "jdanis@google.com", "time": "Wed Mar 23 09:22:17 2016 +0000" }, "committer": { "name": "Janis Danisevskis", "email": "jdanis@google.com", "time": "Wed Mar 23 10:33:35 2016 +0000" }, "message": "Document restricted app private file permissions\n\nMake the docs reflect changes in private file access permissions.\n\nStarting with API level 24 app private files are exclusively accessible\nto the owning app. Files can no longer be shared by name because apps\ncannot relax the files system permissions.\n\nBug: 27636012\nChange-Id: Iac80504b06f6e37ce109222092f77788ed388393\n" }, { "commit": "1070ed402c12e254c5bb8744f15750c8f10a88bd", "tree": "f661980e38dd1b0de547db68ba0a9e60831f6e3f", "parents": [ "0bee3d299777344b358fc13dda9630d64446b57f" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Tue Mar 22 20:27:06 2016 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Mar 23 03:35:30 2016 +0000" }, "message": "docs: Fixed resource/theme value syntax.\n\nWithin the \"Resource values\" sub-section within the \"File Conventions\"\nsection of the \"App Manifest\" page, changed the separator between the\nname/value pair for resources and themes such that it is now\nconsistently a \u0027/\u0027 character.\n\nBug: 27070041\nChange-Id: Ie299fbb866b9de3afaffa8fb70e3ca3709c45735\n" } ], "next": "0bee3d299777344b358fc13dda9630d64446b57f" }