)]}' { "log": [ { "commit": "b6d1832fc48d13b9e1de2815fd6946d107997e57", "tree": "73fbaeb0290e81038c200b614f1995de573c4340", "parents": [ "4f1a1aa39be92f9088f9d204a8fffebe1e364c37", "50403a203357ec9e003b198728f89278c88d4f0f" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Nov 29 09:56:26 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 29 09:56:26 2010 -0800" }, "message": "Merge \"docs: more docs for action bar add drop-down navigation and action view\"" }, { "commit": "1318af1a476bb39b80fcadf5e545856aa2e90de2", "tree": "097df44f6d2d79ba14bfb5b8929e377b5c8d7965", "parents": [ "4a4f0cd86f6dc8de23767613ef28a9a0c7ca92d2" ], "author": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Sun Nov 28 19:52:03 2010 -0800" }, "committer": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Sun Nov 28 21:06:57 2010 -0800" }, "message": "Fixing a typo in onCreate sample code.\n\nChange-Id: Ia03bf2bfcfee95fd3a856f9fb87d12cd6c99219c\n" }, { "commit": "50403a203357ec9e003b198728f89278c88d4f0f", "tree": "cb718dd2da3908ef81d45895e40e6ad1c7eb2a81", "parents": [ "83f5eccb0c4b29fafc9f505d429492b358453ea1" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Nov 23 14:45:03 2010 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 24 16:45:47 2010 -0800" }, "message": "docs: more docs for action bar\nadd drop-down navigation and action view\n\nChange-Id: I9968def5442646263a482eb28520f099d3c7d6e0\n" }, { "commit": "d4fbcfa2201ead5e22614040e9159b062461c85c", "tree": "00ea029be0fcf0c937ed50e41f36222426a0aa07", "parents": [ "f9beaeffef4e8468d2fbf347260b5e89f47d0984", "9e3d14c4aad7e41406f633734973b191c21b5c5c" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 24 16:23:04 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 24 16:23:04 2010 -0800" }, "message": "am 9e3d14c4: am 93116f8f: am 3577f51d: docs: clarify \u003cinclude\u003e layout properties bug: 3227820\n\n* commit \u00279e3d14c4aad7e41406f633734973b191c21b5c5c\u0027:\n docs: clarify \u003cinclude\u003e layout properties bug: 3227820\n" }, { "commit": "9e3d14c4aad7e41406f633734973b191c21b5c5c", "tree": "4eaec446b09804aedc1ba5162b750e29949e1d09", "parents": [ "9df7f31359866a77a47c9fab3171c71715fd0056", "93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 24 12:43:08 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 24 12:43:08 2010 -0800" }, "message": "am 93116f8f: am 3577f51d: docs: clarify \u003cinclude\u003e layout properties bug: 3227820\n\n* commit \u002793116f8fb171a3cf0e9b68b70e2b275a8b6a32f7\u0027:\n docs: clarify \u003cinclude\u003e layout properties bug: 3227820\n" }, { "commit": "93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7", "tree": "5ff683b7a3f69f09e4ffbd4ffd1d3d8b26ecd561", "parents": [ "5df8c155872833647ac56951ab90bd26a9af9480", "3577f51d4bc236a11e283855337752a7b6897f8b" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 24 12:39:42 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 24 12:39:42 2010 -0800" }, "message": "am 3577f51d: docs: clarify \u003cinclude\u003e layout properties bug: 3227820\n\n* commit \u00273577f51d4bc236a11e283855337752a7b6897f8b\u0027:\n docs: clarify \u003cinclude\u003e layout properties bug: 3227820\n" }, { "commit": "3577f51d4bc236a11e283855337752a7b6897f8b", "tree": "1c0db43b14d63f8d6d6a3c780369d3d61bbc5874", "parents": [ "2cbe92ea6d36adb721b0cb94f5dbecb9c9e71ad8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 24 11:24:33 2010 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 24 11:24:33 2010 -0800" }, "message": "docs: clarify \u003cinclude\u003e layout properties\nbug: 3227820\n\nChange-Id: Id5130cd805ee2ea545a795019fb375ffd841727f\n" }, { "commit": "f67eb43600f16dc7f64687d9790417298aa7a709", "tree": "979d37a19303c1b1b106906f19500269f523ae6e", "parents": [ "07cb89432cf1687ba4f903f56bc1d92979d2cd4a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Nov 23 14:46:49 2010 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Nov 23 14:46:49 2010 -0800" }, "message": "docs: fix code snippet error\n\nChange-Id: I5d65effce4a88af2cbf990276015ed24200037b5\n" }, { "commit": "621e17de87f18003aba2dedb719a2941020a7902", "tree": "978b402ced5bd03d3b4f6eaa9fbaaf186427823c", "parents": [ "703c5f39c58168829e8d8f7ed7b5aea3f4fb600b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 22 15:59:56 2010 -0800" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 22 18:35:55 2010 -0800" }, "message": "Implement issue #3221502: New APIs to support new back stack / task navigation\n\nWhat this adds:\n\n- A new Intent activity flag to completely replace an existing task.\n- A new Intent activity flag to bring the current home task up behind\n a new task being started/brought to the foreground.\n- New versions of startActivity() that take an array of Intents to be\n started, allowing applications to start a task in a specific state.\n- A public moveTaskToFront() method on ActivityManager, with a new flag\n that allows the caller to have the task moved to the front with the\n current home task immediately behind it.\n\nChange-Id: Ie8028d09acffb5349d98043c67676daba09f75c8\n" }, { "commit": "18439bee6f8b525abe3f1fac69bc4cea184e1565", "tree": "57f3b80f431b8d7ad0e0059c29c0e74c4cf10336", "parents": [ "56b1b8bb1fec8690510e72a7042ebb06f3fbf5d1" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Sep 07 17:11:38 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Nov 22 10:42:36 2010 -0800" }, "message": "docs: add dev guide for action bar and update other relevant documents\n\nChange-Id: I1d3deda4c35066f7cf05b06fe5b60acfa1fae149\n" }, { "commit": "1385d89d5e65e3ecf9ce58160231ddcfa25cb9b8", "tree": "a2aeba10034bfb1cc7b6420d47c908a3f2e898b3", "parents": [ "621b41c7447fdcf312e805d05973051e707333ab", "55ff5708bb166ab985ffd89e62ddcb13927d6403" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Nov 19 16:56:53 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 19 16:56:53 2010 -0800" }, "message": "am 55ff5708: am 828b6816: Merge \"docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462\" into gingerbread\n\n* commit \u002755ff5708bb166ab985ffd89e62ddcb13927d6403\u0027:\n docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462\n" }, { "commit": "55ff5708bb166ab985ffd89e62ddcb13927d6403", "tree": "7813ca0e1af9ee1ef533a3db4086f6f6b2386f28", "parents": [ "716f60ce605131429dc9efe8f351f0da0c8cc8c2", "828b68166679ebfc0002e2ea516ca91e6fb13597" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Nov 19 16:51:57 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 19 16:51:57 2010 -0800" }, "message": "am 828b6816: Merge \"docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462\" into gingerbread\n\n* commit \u0027828b68166679ebfc0002e2ea516ca91e6fb13597\u0027:\n docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462\n" }, { "commit": "828b68166679ebfc0002e2ea516ca91e6fb13597", "tree": "418b39d7d4b9b5a8f14fd2b38db220acb8915957", "parents": [ "0e29064d1caad7b82aa76876e7e2f4c86ded06d2", "ae5335b673be71fe96b8871ea376337d29e01e6e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Nov 19 16:48:50 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 19 16:48:50 2010 -0800" }, "message": "Merge \"docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462\" into gingerbread" }, { "commit": "fb77461234f29f258a78062065fb5d2db9cc5610", "tree": "37dbdaf2cf7260b79df859dc9e836b2e5f9d196e", "parents": [ "44138f15cef6cfc84686f39227cf61062eb7817e", "00f502a38cc4d6e2278f962b04308e6590dba36b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Nov 19 10:56:26 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 19 10:56:26 2010 -0800" }, "message": "am 00f502a3: am 0e29064d: Merge \"Doc change: update media formats table.\" into gingerbread\n\n* commit \u002700f502a38cc4d6e2278f962b04308e6590dba36b\u0027:\n Doc change: update media formats table.\n" }, { "commit": "00f502a38cc4d6e2278f962b04308e6590dba36b", "tree": "36212df9da7a1384f051e348572dd155e66814b3", "parents": [ "096c4c448d8110c21108f2db4a19a85099e78557", "0e29064d1caad7b82aa76876e7e2f4c86ded06d2" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Nov 19 10:53:20 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 19 10:53:20 2010 -0800" }, "message": "am 0e29064d: Merge \"Doc change: update media formats table.\" into gingerbread\n\n* commit \u00270e29064d1caad7b82aa76876e7e2f4c86ded06d2\u0027:\n Doc change: update media formats table.\n" }, { "commit": "0e29064d1caad7b82aa76876e7e2f4c86ded06d2", "tree": "ba68731456d8a6b82115e5c27aac67cd4fc8f0e3", "parents": [ "671a6ff4be11b3e2d8eb017e0c7a78e6133fb2b8", "a2587c4604297baad490bf50711a7be772a4e2e2" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Nov 19 10:47:10 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 19 10:47:10 2010 -0800" }, "message": "Merge \"Doc change: update media formats table.\" into gingerbread" }, { "commit": "c18b534585741e1cc6c8328f7761c906f58c2684", "tree": "f20c941b05db8e6a0c2d77297a4cfb9509c7c103", "parents": [ "3d1c5a27884ef01772b187ff250daadb7678572e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Aug 17 11:48:09 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Nov 18 12:42:47 2010 -0800" }, "message": "new docs for fragments\n\nChange-Id: Ia21a4c844d475a743399d25dfe43f916d423258c\n" }, { "commit": "0f6f51879cf6fbb6e21e7f6e3ffd2625c5a9a5f6", "tree": "917892ce58da594c4a38a4af9dbe23daee5082ca", "parents": [ "691da62bfeed0c00df82aa495d3510c134cbac8a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Nov 16 22:52:09 2010 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 17 19:34:28 2010 -0800" }, "message": "docs: revise menu resources to account for action bar\n\nChange-Id: I40d61653e02735f6a0b47449191b71c233b36fa3\n" }, { "commit": "691da62bfeed0c00df82aa495d3510c134cbac8a", "tree": "fad9e60384470e4ecd2d6d0ba10dced438a02db4", "parents": [ "fcb46e53be81c15f6ab9180f3d8414faafc8c822", "705c179e3aade32f0e288299ba4519d4ee0a333f" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 17 18:40:50 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 17 18:40:50 2010 -0800" }, "message": "am 705c179e: am 0fe33a48: am 2cbe92ea: docs: add better visibility to app install location doc\n\n* commit \u0027705c179e3aade32f0e288299ba4519d4ee0a333f\u0027:\n docs: add better visibility to app install location doc\n" }, { "commit": "705c179e3aade32f0e288299ba4519d4ee0a333f", "tree": "3989b2ea1cd8faf0991b79c9d52a6f5548fd5e17", "parents": [ "977d01f392d820da82e9bfdc00166302ca4d21f7", "0fe33a4835ae3721f6302f3f2112d79e43b2b4f6" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 17 18:37:50 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 17 18:37:50 2010 -0800" }, "message": "am 0fe33a48: am 2cbe92ea: docs: add better visibility to app install location doc\n\n* commit \u00270fe33a4835ae3721f6302f3f2112d79e43b2b4f6\u0027:\n docs: add better visibility to app install location doc\n" }, { "commit": "0fe33a4835ae3721f6302f3f2112d79e43b2b4f6", "tree": "2c11889ab5fabda1c14f48a754308224a00045e6", "parents": [ "fc1f5e24bcd678a08221c8c01a364807edca6daf", "2cbe92ea6d36adb721b0cb94f5dbecb9c9e71ad8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 17 18:34:40 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 17 18:34:40 2010 -0800" }, "message": "am 2cbe92ea: docs: add better visibility to app install location doc\n\n* commit \u00272cbe92ea6d36adb721b0cb94f5dbecb9c9e71ad8\u0027:\n docs: add better visibility to app install location doc\n" }, { "commit": "2cbe92ea6d36adb721b0cb94f5dbecb9c9e71ad8", "tree": "6628a8551ef1bd7b553dc764d2a2017db45eab9b", "parents": [ "5a72672977b2682ee93160124d8fae9d64c16fe8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 17 18:14:58 2010 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 17 18:14:58 2010 -0800" }, "message": "docs: add better visibility to app install location doc\n\nChange-Id: Ib36a53c69a918eab4378d5ec7d25ec89be1b7070\n" }, { "commit": "7b71b3d99f4b1cfbe70cc195ddc875a44f1dfb27", "tree": "e9630e0142378e9df63f1ef144c185f58dce913b", "parents": [ "96aad38290116439510af6c2fe0517f047578857", "31c5f68d8f4af170415c206753f08fa85aa6b2ff" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Nov 17 16:24:04 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 17 16:24:04 2010 -0800" }, "message": "am 31c5f68d: am fc1f5e24: doc change: update uses-feature for gingerbread.\n\n* commit \u002731c5f68d8f4af170415c206753f08fa85aa6b2ff\u0027:\n doc change: update uses-feature for gingerbread.\n" }, { "commit": "31c5f68d8f4af170415c206753f08fa85aa6b2ff", "tree": "9d56f8f0aaf573d5d58f9db835f947f414e613ae", "parents": [ "d28dc3cf7738f5574ef6359a67d68820dc6c2ad4", "fc1f5e24bcd678a08221c8c01a364807edca6daf" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Nov 17 16:20:59 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 17 16:20:59 2010 -0800" }, "message": "am fc1f5e24: doc change: update uses-feature for gingerbread.\n\n* commit \u0027fc1f5e24bcd678a08221c8c01a364807edca6daf\u0027:\n doc change: update uses-feature for gingerbread.\n" }, { "commit": "fc1f5e24bcd678a08221c8c01a364807edca6daf", "tree": "9320b6af889c61bfd3211f13b5dbe129e5c65420", "parents": [ "05434e9fa7a6ec844611bbd154c4a3eceafec538" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Nov 02 19:15:51 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Nov 17 16:15:52 2010 -0800" }, "message": "doc change: update uses-feature for gingerbread.\n\nChange-Id: I1af174da527a91e111d6bdecaad8c08bde050c24\n" }, { "commit": "a2587c4604297baad490bf50711a7be772a4e2e2", "tree": "7ff1600181ed15d2c3eeb49dc4d7589fee4c7031", "parents": [ "05434e9fa7a6ec844611bbd154c4a3eceafec538" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Nov 17 10:28:31 2010 -0800" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Nov 17 10:30:32 2010 -0800" }, "message": "Doc change: update media formats table.\n\nChange-Id: I0a39fed18f7b2d42fc7690ead230b1861332bd4e\n" }, { "commit": "ae5335b673be71fe96b8871ea376337d29e01e6e", "tree": "2567ec5c3ecdb9bdae8b597d27837abf4e001bf7", "parents": [ "77f5c9542e159cb9f2f2908227212d4add8ce74c" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 03 14:46:36 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 10 15:27:40 2010 -0800" }, "message": "docs: add docs for xhdpi and xlarge screen support\nupdate screen ranges figure\nbug: 3099462\n\nChange-Id: I4667f105df2ddc04a8e2b6c3ad06ec0ded2dccd2\n" }, { "commit": "de87598837275b18f1c50c1ab5f14de88e83e27f", "tree": "7220e510d9ee830d5fde2e9a7f43a2c269f3c0b4", "parents": [ "dfa448f759e0e91b788e2620a4cf7187b893d24e", "311c27a19cc9e17d6676f863733c530f7bdebde9" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Nov 09 09:36:38 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 09 09:36:38 2010 -0800" }, "message": "Merge \"Amended 9patch border documentation\"" }, { "commit": "311c27a19cc9e17d6676f863733c530f7bdebde9", "tree": "82b3083ff58fc639e5648a31fe7e9e698bd5a51e", "parents": [ "460119b7ea7a4ca8490db9af5c2983419dd816b0" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon Nov 08 17:41:26 2010 -0800" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon Nov 08 17:41:26 2010 -0800" }, "message": "Amended 9patch border documentation\n\nChange-Id: I6e65aff09ab467016fdf3486902dfe26036bb6e9\n" }, { "commit": "b6c6579511246210cc713bb83f928e274352de75", "tree": "fc088f5a96bb83e679fba8ee7c09b7da672c5205", "parents": [ "d44266cec387e76b788b4eb84b28463fa3268c66", "a27fc901d8543c7734f70f0ef05977dcb94671f6" ], "author": { "name": "Robert Ly", "email": "robertly@google.com", "time": "Sat Nov 06 16:24:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 06 16:24:52 2010 -0700" }, "message": "am a27fc901: am 47e43feb: Doc change: Proguard tool\n\n* commit \u0027a27fc901d8543c7734f70f0ef05977dcb94671f6\u0027:\n Doc change: Proguard tool\n" }, { "commit": "3513c3f17f6fdbb92d1bf3be68df97708bacbc82", "tree": "f16ee20b32bb528a2a03ff9a7f671653a74ec51b", "parents": [ "12b1401262845d9b906d64ab54260c1378ade4a5", "04856d99f8f353711f294254c1159461213684a5" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Nov 06 16:24:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 06 16:24:20 2010 -0700" }, "message": "am 04856d99: am 6e88c84c: docs: remove allowClearUserData from \u003capplication\u003e manifest doc and clarify in javadocs that it\\\u0027s only for system apps bug: 3128020\n\n* commit \u002704856d99f8f353711f294254c1159461213684a5\u0027:\n docs: remove allowClearUserData from \u003capplication\u003e manifest doc and clarify in javadocs that it\u0027s only for system apps bug: 3128020\n" }, { "commit": "a27fc901d8543c7734f70f0ef05977dcb94671f6", "tree": "342b9e9e56ddc159be1103fc8f365fe81222a429", "parents": [ "01128df3c442b87f601d9c13ff2ebd54b015925d", "47e43febdd8ba83c333c9c98ca6a8c0bda421305" ], "author": { "name": "Robert Ly", "email": "robertly@google.com", "time": "Fri Nov 05 13:58:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 05 13:58:12 2010 -0700" }, "message": "am 47e43feb: Doc change: Proguard tool\n\n* commit \u002747e43febdd8ba83c333c9c98ca6a8c0bda421305\u0027:\n Doc change: Proguard tool\n" }, { "commit": "04856d99f8f353711f294254c1159461213684a5", "tree": "1fe2bbe69b3ec43cb52e93267866471c9eb38db6", "parents": [ "c3b112ba20310a8f89c42f7a21295890660191d7", "6e88c84cbe0a07cb8c7b9ea23d1434bcf2e2a457" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Nov 05 13:57:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 05 13:57:31 2010 -0700" }, "message": "am 6e88c84c: docs: remove allowClearUserData from \u003capplication\u003e manifest doc and clarify in javadocs that it\\\u0027s only for system apps bug: 3128020\n\n* commit \u00276e88c84cbe0a07cb8c7b9ea23d1434bcf2e2a457\u0027:\n docs: remove allowClearUserData from \u003capplication\u003e manifest doc and clarify in javadocs that it\u0027s only for system apps bug: 3128020\n" }, { "commit": "47e43febdd8ba83c333c9c98ca6a8c0bda421305", "tree": "5ce1c1e5764e4e6b0ebe067548e58cec4309a967", "parents": [ "ce22d608733953e367a590efd9c7656a68ffc24d" ], "author": { "name": "Robert Ly", "email": "robertly@google.com", "time": "Thu Oct 21 17:12:00 2010 -0700" }, "committer": { "name": "Robert Ly", "email": "robertly@google.com", "time": "Fri Nov 05 10:14:26 2010 -0700" }, "message": "Doc change: Proguard tool\n\nChange-Id: I98602bf61a971f00cbd41284b457bcb2c15ea441\n" }, { "commit": "6e88c84cbe0a07cb8c7b9ea23d1434bcf2e2a457", "tree": "c23227fd2ded84fb84b0684e57c66551114f5332", "parents": [ "265acc5085ad03c4c043dd33faed808b55732134" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Nov 04 18:45:05 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Nov 04 18:45:05 2010 -0700" }, "message": "docs: remove allowClearUserData from \u003capplication\u003e manifest doc\nand clarify in javadocs that it\u0027s only for system apps\nbug: 3128020\n\nChange-Id: Ibc01f0e24f7d1f4e76a4da0a324c7682b92992aa\n" }, { "commit": "ce4b523eb81a07b985ac08973e43d0c7629ff36d", "tree": "f33d5cf51a705fa3f541729351604f615768fbd7", "parents": [ "badf945656d9c584b7ac7cf88b9c55fe6c393ce6", "d9bb6bc283b3f7ee75da14c42c8a563214103c05" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Nov 04 07:20:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 04 07:20:33 2010 -0700" }, "message": "am d9bb6bc2: am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc\n\n* commit \u0027d9bb6bc283b3f7ee75da14c42c8a563214103c05\u0027:\n docs: provide overview of the web apps docs and revise images in the targeting doc\n" }, { "commit": "d9bb6bc283b3f7ee75da14c42c8a563214103c05", "tree": "eda9d89c3728e35df69760f50261786219e6d0c1", "parents": [ "ade230ed99097a09584a793ce720cc869c9ffeb4", "08810efc1a1868261fb042355f75ab049438b6e3" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 03 15:18:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 03 15:18:10 2010 -0700" }, "message": "am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc\n\n* commit \u002708810efc1a1868261fb042355f75ab049438b6e3\u0027:\n docs: provide overview of the web apps docs and revise images in the targeting doc\n" }, { "commit": "08810efc1a1868261fb042355f75ab049438b6e3", "tree": "cf77f0a033d9d64d11f2d625323d5ed8eb180a52", "parents": [ "112b5b1f304846a1f6999a8347f45dae43719b8f" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 11 15:37:14 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Nov 03 14:48:21 2010 -0700" }, "message": "docs: provide overview of the web apps docs and revise images in the targeting doc\n\nChange-Id: I7c7c5b1936bea0676a2cafa5020e2b997c0b8634\n" }, { "commit": "d8c2efdcd3ba9c2cbcb98a108156f13ff8cd3fc0", "tree": "92225fd3273974b77b651261d5d0ecaa50aa3c4b", "parents": [ "41727a4592bde9a9c7207258ffcc2105c1d90ab5", "243a28ba2d58acea96a33cd6c73cb805a653863f" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Nov 03 11:42:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 03 11:42:31 2010 -0700" }, "message": "am 243a28ba: am 4e4d0d5f: am 36a1bcee: Merge \"Doc change: Update uses-feature and permissions docs.\" into froyo\n\n* commit \u0027243a28ba2d58acea96a33cd6c73cb805a653863f\u0027:\n Doc change: Update uses-feature and permissions docs.\n" }, { "commit": "a7bd8857383bb20d9a5589cd60752a842230131f", "tree": "1e9fe002669dff8f1f2cc6c23cd427835d660c82", "parents": [ "54e460f49f4c800a1ff9d1e6316232fb0800c2dc", "fcea62a64cba3422ae7d0c1eeee529fd49485984" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Nov 03 10:59:03 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 03 10:59:03 2010 -0700" }, "message": "am fcea62a6: am c1fad4a2: Merge \"DOC CHANGE: Add entry for monkeyrunner to tools index page.\" into gingerbread\n\n* commit \u0027fcea62a64cba3422ae7d0c1eeee529fd49485984\u0027:\n DOC CHANGE: Add entry for monkeyrunner to tools index page.\n" }, { "commit": "243a28ba2d58acea96a33cd6c73cb805a653863f", "tree": "1945ff9e9e983cbe64f469c67c8da58a9aa5731f", "parents": [ "f3a6b901917b1609c6f1901bb36deb07a58fd20d", "4e4d0d5f207421b0a2ce134fe17d7c78defc9dac" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Nov 02 17:47:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 02 17:47:20 2010 -0700" }, "message": "am 4e4d0d5f: am 36a1bcee: Merge \"Doc change: Update uses-feature and permissions docs.\" into froyo\n\n* commit \u00274e4d0d5f207421b0a2ce134fe17d7c78defc9dac\u0027:\n Doc change: Update uses-feature and permissions docs.\n" }, { "commit": "4e4d0d5f207421b0a2ce134fe17d7c78defc9dac", "tree": "d927f8d49bd09301736ea7338c856cc15d6f7fb2", "parents": [ "38e561dd3cd72160035d8b3002fc9bbaf3071374", "36a1bcee76d35636b4050674eb98285c3a3a6c2f" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Nov 02 17:43:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 02 17:43:54 2010 -0700" }, "message": "am 36a1bcee: Merge \"Doc change: Update uses-feature and permissions docs.\" into froyo\n\n* commit \u002736a1bcee76d35636b4050674eb98285c3a3a6c2f\u0027:\n Doc change: Update uses-feature and permissions docs.\n" }, { "commit": "f1e134ba6ae61353e431e5e95b7d4520c82edc9d", "tree": "9d2e993eb0fec270658b67baa381ecf2a02ba2da", "parents": [ "579db096fa05bd077fadb04876ecf99e3ccd02b9" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Jul 28 08:19:45 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Nov 02 17:37:23 2010 -0700" }, "message": "Doc change: Update uses-feature and permissions docs.\n\nChange-Id: I80b45840d83e0622a7b5efeed00a3c659d80ca9b\n" }, { "commit": "fcea62a64cba3422ae7d0c1eeee529fd49485984", "tree": "aa43009f40dc39cb07c5ae9d387d1ecdd0892b83", "parents": [ "19ed73ae7fddf66b335a89a33d346a5b50c1f274", "c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Tue Nov 02 13:18:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 02 13:18:47 2010 -0700" }, "message": "am c1fad4a2: Merge \"DOC CHANGE: Add entry for monkeyrunner to tools index page.\" into gingerbread\n\n* commit \u0027c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d\u0027:\n DOC CHANGE: Add entry for monkeyrunner to tools index page.\n" }, { "commit": "6c49981d51eba1040a706e8bbbc475cc94948464", "tree": "737d57304ecc3fb57a99db36050fd811c6040b76", "parents": [ "a7fda21c8298d8f316564280d702206147207005" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Nov 01 17:19:40 2010 -0700" }, "committer": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Nov 01 17:19:40 2010 -0700" }, "message": "DOC CHANGE: Add entry for monkeyrunner to tools index page.\n\nChange-Id: I6487521c3ab7cdf641242598dee6e2752f46fa7a\n" }, { "commit": "ea8400b448a01e417e583ef554fc2b3f3072deec", "tree": "cb61ac8e0a3dd3692d3a46d35f61b302266709d5", "parents": [ "ab1b304bd4cf0bb6473b21d5604596105b794362", "a7fda21c8298d8f316564280d702206147207005" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Nov 01 16:30:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 01 16:30:59 2010 -0700" }, "message": "am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool\n\n* commit \u0027a7fda21c8298d8f316564280d702206147207005\u0027:\n DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool\n" }, { "commit": "a7fda21c8298d8f316564280d702206147207005", "tree": "c3a737289adc2ea3b404d01425a7d95b404a4974", "parents": [ "ccb75a882f670f8928f13a485c0c29b8b8b93af3" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 18 17:07:45 2010 -0700" }, "committer": { "name": "Bill Napier", "email": "napier@google.com", "time": "Mon Nov 01 16:12:54 2010 -0700" }, "message": "DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool\n\nChange-Id: I049c5f70c47077c51fefbae32633592e80068df2\n" }, { "commit": "9a7eab8d0a98203941f64e705ba74ba9e3eb17f3", "tree": "a59c8708ca7a64cb7109d83ece7b42dcfea58a3c", "parents": [ "4f405ecee998e704023fcd6b1f67aae4f0b5979c" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 18 17:07:45 2010 -0700" }, "committer": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Nov 01 13:11:28 2010 -0700" }, "message": "Doc Change: Documentation for MonkeyRunner tool\n\nChange-Id: I6bf21fe1e406b771c9fe8c36be4ad60b522d088d\n" }, { "commit": "4f405ecee998e704023fcd6b1f67aae4f0b5979c", "tree": "2f736ebe045c2cda2e1d312722d933507d6d9529", "parents": [ "4f50e8863f921ad2029d8d9450a31a143c151fa0", "ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 01 12:52:36 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 01 12:52:36 2010 -0700" }, "message": "am ce0f9e4e: am 42679cea: Merge \"Fix issue #3152415: Various confusions in docs about Application\" into gingerbread\n\n* commit \u0027ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba\u0027:\n Fix issue #3152415: Various confusions in docs about Application\n" }, { "commit": "ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba", "tree": "c1c19c271df8c38c6e7cac989f8d57f507105355", "parents": [ "ce128ae66dc6d430aad09ad920133bc040d834c8", "42679cea5d8bc4b235b290b97805b86c8c7cbca5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 01 12:49:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 01 12:49:51 2010 -0700" }, "message": "am 42679cea: Merge \"Fix issue #3152415: Various confusions in docs about Application\" into gingerbread\n\n* commit \u002742679cea5d8bc4b235b290b97805b86c8c7cbca5\u0027:\n Fix issue #3152415: Various confusions in docs about Application\n" }, { "commit": "7025d8e4b96f14a92f9bb20902732f43d1c93e7b", "tree": "2efe2dba3ca25948605465b5811ad8cdb9c24a57", "parents": [ "38fd394815a992c8874f73389e8ca849782e5fcd" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 01 09:49:37 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 01 09:49:37 2010 -0700" }, "message": "Fix issue #3152415: Various confusions in docs about Application\n\nChange-Id: Ie1b480ed7a47a3eb6ffff76bef0dcd7b2b845e83\n" }, { "commit": "39f3e380fe6422ab25ecd04ce628df0d3e799e1f", "tree": "607de75e71dcc3f0f2de163df37d6bad336acbef", "parents": [ "f51964f64fa043643aa1f107fd93c566e814e29c", "96bdc500104c3e162495a9bfcf90799467e45c3d" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 16:27:15 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 16:27:15 2010 -0700" }, "message": "am 96bdc500: am 5016df1c: Merge \"Doc Change: Revert NotePad sample test package\" into gingerbread\n\nMerge commit \u002796bdc500104c3e162495a9bfcf90799467e45c3d\u0027\n\n* commit \u002796bdc500104c3e162495a9bfcf90799467e45c3d\u0027:\n Doc Change: Revert NotePad sample test package\n" }, { "commit": "96bdc500104c3e162495a9bfcf90799467e45c3d", "tree": "d82b196b06dd6943d6e15ff6b8e9e5cb5be66349", "parents": [ "b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b", "5016df1cface59b04ad59d0fef29ea32dcad8d60" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 16:22:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 16:22:46 2010 -0700" }, "message": "am 5016df1c: Merge \"Doc Change: Revert NotePad sample test package\" into gingerbread\n\nMerge commit \u00275016df1cface59b04ad59d0fef29ea32dcad8d60\u0027 into gingerbread-plus-aosp\n\n* commit \u00275016df1cface59b04ad59d0fef29ea32dcad8d60\u0027:\n Doc Change: Revert NotePad sample test package\n" }, { "commit": "24fed74a34bb0b4dc35d0a86c2b99991fa86c848", "tree": "093edefbd0f16f5982ee0ddcb2bfe3770d5f8c01", "parents": [ "106165b5102be226eb8049d2f7f62d7e26034e8a" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 15:55:13 2010 -0700" }, "committer": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 15:55:13 2010 -0700" }, "message": "Doc Change: Revert NotePad sample test package\n\nChange-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37\n" }, { "commit": "dbb78f0e4ee3a1ba3e3418b0c1bf8b51e4fa2019", "tree": "d005eef53e3e7e0bf00b8c43ccb26b2152c49af5", "parents": [ "2d8933879c1807935fd9540444a2a7723fce343b", "81df9841c64e417fe2adfab0e8d694af09e07c0d" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sun Oct 17 13:49:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 17 13:49:45 2010 -0700" }, "message": "am 81df9841: am 2c1dab44: am fda5b19c: Merge \"docs: fix typo; surface dev guide link in package description\" into froyo\n\nMerge commit \u002781df9841c64e417fe2adfab0e8d694af09e07c0d\u0027\n\n* commit \u002781df9841c64e417fe2adfab0e8d694af09e07c0d\u0027:\n docs: fix typo; surface dev guide link in package description\n" }, { "commit": "2d8933879c1807935fd9540444a2a7723fce343b", "tree": "019f1b641cdc647437ce11375f7fe6a6e54e9bdb", "parents": [ "2b7b7c1543db7b1629b0f18a875e5f52f2787a93", "b2bd470010279fe45e2848aa8cd0b3ad6f6ca800" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sun Oct 17 13:49:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 17 13:49:35 2010 -0700" }, "message": "am b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errors\n\nMerge commit \u0027b2bd470010279fe45e2848aa8cd0b3ad6f6ca800\u0027\n\n* commit \u0027b2bd470010279fe45e2848aa8cd0b3ad6f6ca800\u0027:\n docs: fix code snippet errors\n" }, { "commit": "5ac4fe5113a1ece839560d0b57373755745a0c2f", "tree": "a39dc2975f1edc856c27d13ce1e6ea3ebac2f245", "parents": [ "8bc68360b6172a2e1a057d5154ab19629e60ccf7", "6bc34da8acf26c8e70325719fe43eaf22489809d" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Oct 16 09:43:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Oct 16 09:43:23 2010 -0700" }, "message": "am 6bc34da8: am 612ebb92: Revert \"Update the documentation for content provider security.\"\n\nMerge commit \u00276bc34da8acf26c8e70325719fe43eaf22489809d\u0027\n\n* commit \u00276bc34da8acf26c8e70325719fe43eaf22489809d\u0027:\n Revert \"Update the documentation for content provider security.\"\n" }, { "commit": "8bc68360b6172a2e1a057d5154ab19629e60ccf7", "tree": "dc34e7d21fc57fd21c2fa56dbd5d319abb22e15b", "parents": [ "8f9486c1adb396d20b439da7141e5eb0f81166e2", "86052a87409e7ceac654ffebbb9bcfce1597c5d8" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Oct 16 09:14:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Oct 16 09:14:21 2010 -0700" }, "message": "am 86052a87: am 66f1c459: Merge \"Update the documentation for content provider security.\" into gingerbread\n\nMerge commit \u002786052a87409e7ceac654ffebbb9bcfce1597c5d8\u0027\n\n* commit \u002786052a87409e7ceac654ffebbb9bcfce1597c5d8\u0027:\n Update the documentation for content provider security.\n" }, { "commit": "81df9841c64e417fe2adfab0e8d694af09e07c0d", "tree": "e02b8ab105ca55afc5c26c6675294583a3f75d8c", "parents": [ "b2bd470010279fe45e2848aa8cd0b3ad6f6ca800", "2c1dab44834fb20deda9f380dae1bd7c1826b40b" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 18:23:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:23:34 2010 -0700" }, "message": "am 2c1dab44: am fda5b19c: Merge \"docs: fix typo; surface dev guide link in package description\" into froyo\n\nMerge commit \u00272c1dab44834fb20deda9f380dae1bd7c1826b40b\u0027 into gingerbread-plus-aosp\n\n* commit \u00272c1dab44834fb20deda9f380dae1bd7c1826b40b\u0027:\n docs: fix typo; surface dev guide link in package description\n" }, { "commit": "b2bd470010279fe45e2848aa8cd0b3ad6f6ca800", "tree": "97a3022d458b054229db50bd1dd15181b3053165", "parents": [ "92e0fd6ce20a111e9ad82b5b252b892e2b971b98", "7f3addf37f0aa106507792e8d9eaa3fb6662cdbb" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 18:23:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:23:26 2010 -0700" }, "message": "am 7f3addf3: am 09da9609: docs: fix code snippet errors\n\nMerge commit \u00277f3addf37f0aa106507792e8d9eaa3fb6662cdbb\u0027 into gingerbread-plus-aosp\n\n* commit \u00277f3addf37f0aa106507792e8d9eaa3fb6662cdbb\u0027:\n docs: fix code snippet errors\n" }, { "commit": "a79935afd08a2dd891373561a3f46c9fa05b2560", "tree": "56212cf547cd9aec0582cd8d1524ac8fbd9d64d7", "parents": [ "21420d6d847e111c425233821eddb918cc50a456", "439444d9043c46669d2fe8694ed3db8f09d92282" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Fri Oct 15 14:26:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 14:26:57 2010 -0700" }, "message": "am 439444d9: am 75d3591b: Merge \"DOC CHANGE: Fix bug in Testing doc\" into gingerbread\n\nMerge commit \u0027439444d9043c46669d2fe8694ed3db8f09d92282\u0027\n\n* commit \u0027439444d9043c46669d2fe8694ed3db8f09d92282\u0027:\n DOC CHANGE: Fix bug in Testing doc\n" }, { "commit": "2c1dab44834fb20deda9f380dae1bd7c1826b40b", "tree": "038b37462d4d30858dee06acc6245ec411091193", "parents": [ "7f3addf37f0aa106507792e8d9eaa3fb6662cdbb", "fda5b19c757645e957c2a224f269aefe39fb1e1c" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 12:35:04 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 12:35:04 2010 -0700" }, "message": "am fda5b19c: Merge \"docs: fix typo; surface dev guide link in package description\" into froyo\n\nMerge commit \u0027fda5b19c757645e957c2a224f269aefe39fb1e1c\u0027 into gingerbread\n\n* commit \u0027fda5b19c757645e957c2a224f269aefe39fb1e1c\u0027:\n docs: fix typo; surface dev guide link in package description\n" }, { "commit": "7f3addf37f0aa106507792e8d9eaa3fb6662cdbb", "tree": "b9eece1a748d08d9f7dd71a2e50f98b585f08873", "parents": [ "d364366824bf2b0aef81780eb673a42e0ba33bce", "09da96099917141f2b90d53f61baa822bdd434d7" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 12:34:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 12:34:50 2010 -0700" }, "message": "am 09da9609: docs: fix code snippet errors\n\nMerge commit \u002709da96099917141f2b90d53f61baa822bdd434d7\u0027 into gingerbread\n\n* commit \u002709da96099917141f2b90d53f61baa822bdd434d7\u0027:\n docs: fix code snippet errors\n" }, { "commit": "fda5b19c757645e957c2a224f269aefe39fb1e1c", "tree": "668cce6a560eea069f866f3bd51488d0d1028a10", "parents": [ "09da96099917141f2b90d53f61baa822bdd434d7", "36cdecd89dbc3eb503197414f525e30ee241ba66" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 10:46:33 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 15 10:46:33 2010 -0700" }, "message": "Merge \"docs: fix typo; surface dev guide link in package description\" into froyo" }, { "commit": "09da96099917141f2b90d53f61baa822bdd434d7", "tree": "c98a908f07233095e0a66364794aef455af7bc9f", "parents": [ "5249ad03454301744374d04e04b38aaad3b01530" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Sep 02 18:09:37 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 10:40:54 2010 -0700" }, "message": "docs: fix code snippet errors\n\nChange-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9\n" }, { "commit": "36cdecd89dbc3eb503197414f525e30ee241ba66", "tree": "289b768995a3b58f0a6c03fe4b787e7d6684db07", "parents": [ "5249ad03454301744374d04e04b38aaad3b01530" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Oct 14 13:42:19 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 10:19:27 2010 -0700" }, "message": "docs: fix typo; surface dev guide link in package description\n\nChange-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d\n" }, { "commit": "6bc34da8acf26c8e70325719fe43eaf22489809d", "tree": "128e452ffb198f2852fe64423fdd53ed11b3b5e4", "parents": [ "86052a87409e7ceac654ffebbb9bcfce1597c5d8", "612ebb9257e2adf982ed846fa43251c3754361f7" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Oct 15 10:11:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 10:11:50 2010 -0700" }, "message": "am 612ebb92: Revert \"Update the documentation for content provider security.\"\n\nMerge commit \u0027612ebb9257e2adf982ed846fa43251c3754361f7\u0027 into gingerbread-plus-aosp\n\n* commit \u0027612ebb9257e2adf982ed846fa43251c3754361f7\u0027:\n Revert \"Update the documentation for content provider security.\"\n" }, { "commit": "612ebb9257e2adf982ed846fa43251c3754361f7", "tree": "ec0e66bffbc05cb2048878ea41cd5b840f377743", "parents": [ "66f1c459ac15d1dba1850cb30759500d35078f29" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Oct 15 10:05:29 2010 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Oct 15 10:05:29 2010 -0700" }, "message": "Revert \"Update the documentation for content provider security.\"\n\nThis reverts commit 4fe4d4c91cdfa59bb8161625be85252e187667a2.\n" }, { "commit": "86052a87409e7ceac654ffebbb9bcfce1597c5d8", "tree": "0e43880cd24c66479f54dbb75ead1effb1266968", "parents": [ "cb90947bf8ed2c898c1b7e529dd0c99d112ed611", "66f1c459ac15d1dba1850cb30759500d35078f29" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Oct 15 09:24:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 09:24:39 2010 -0700" }, "message": "am 66f1c459: Merge \"Update the documentation for content provider security.\" into gingerbread\n\nMerge commit \u002766f1c459ac15d1dba1850cb30759500d35078f29\u0027 into gingerbread-plus-aosp\n\n* commit \u002766f1c459ac15d1dba1850cb30759500d35078f29\u0027:\n Update the documentation for content provider security.\n" }, { "commit": "66f1c459ac15d1dba1850cb30759500d35078f29", "tree": "23a256c333e791d4463ec08d5d937b2a43f4c577", "parents": [ "e1f3976bb4eab0d7c46bc8596679d4d00695148c", "4fe4d4c91cdfa59bb8161625be85252e187667a2" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Oct 15 09:17:12 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 15 09:17:12 2010 -0700" }, "message": "Merge \"Update the documentation for content provider security.\" into gingerbread" }, { "commit": "a8d25065739407d774663b1f19ce995142d3fad5", "tree": "9e08ace14bc47c1268b22a72739d676f38b01688", "parents": [ "232570cc33b86f312f776b10063bc2fe3cf846ef", "5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 15 00:07:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 00:07:26 2010 -0700" }, "message": "am 5cfa877e: am eb4ef072: am 5249ad03: docs: add \"boot completed\" broadcast to list of DO NOTs for installing on external storage bug: 3088494\n\nMerge commit \u00275cfa877e22a2d76d1ea36c3f0c2c708248da3d0e\u0027\n\n* commit \u00275cfa877e22a2d76d1ea36c3f0c2c708248da3d0e\u0027:\n docs: add \"boot completed\" broadcast to list of DO NOTs for installing on external storage\n" }, { "commit": "439444d9043c46669d2fe8694ed3db8f09d92282", "tree": "194f4488572bda87bb3d43700261c81d4c0c4a89", "parents": [ "567db07702f851f2e7fb1fb0021ce2871469183e", "75d3591b2dd60e50182542045147b9b6033c2b85" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Thu Oct 14 12:09:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 14 12:09:33 2010 -0700" }, "message": "am 75d3591b: Merge \"DOC CHANGE: Fix bug in Testing doc\" into gingerbread\n\nMerge commit \u002775d3591b2dd60e50182542045147b9b6033c2b85\u0027 into gingerbread-plus-aosp\n\n* commit \u002775d3591b2dd60e50182542045147b9b6033c2b85\u0027:\n DOC CHANGE: Fix bug in Testing doc\n" }, { "commit": "75d3591b2dd60e50182542045147b9b6033c2b85", "tree": "05bd86be1147eb59a8b527e5769356bd90030873", "parents": [ "2d441e148502bb492816ef84837510397f77a039", "9c61f8fc0108649f4340160a9e0da9d9ee88d392" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Thu Oct 14 12:05:33 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 14 12:05:33 2010 -0700" }, "message": "Merge \"DOC CHANGE: Fix bug in Testing doc\" into gingerbread" }, { "commit": "068e695676bff3f3a125f965a908597d64f7c773", "tree": "6b3c05c78530093e29f6dbb3b5f2f9078e44382a", "parents": [ "b57832140ef7542a9e6f4f69f48efbfe80200c43", "d555e2643f2bdc8b7e6096ce40943fcc56ec22d2" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Oct 13 19:32:02 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Oct 13 19:32:02 2010 -0700" }, "message": "Doc change: Merge commit \u0027d555e264\u0027 into manualmerge\n\nConflicts:\n\tdocs/html/guide/guide_toc.cs\n\nChange-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30\n" }, { "commit": "bbf68c6ad2cc3dd338f93779d60c5821e730a263", "tree": "70d4122b1181e04fd34756dfeb91960ce53dde3c", "parents": [ "cd4af421ca6b102cabd2cf1ff63488e086c32c44", "4711d21a55d9ff6f234d3b06ff2d07dca19238fc" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Oct 13 17:03:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 17:03:10 2010 -0700" }, "message": "am 4711d21a: am 9facd2d0: Merge \"StrictMode: link to designing for responsiveness ANR docs\" into gingerbread\n\nMerge commit \u00274711d21a55d9ff6f234d3b06ff2d07dca19238fc\u0027\n\n* commit \u00274711d21a55d9ff6f234d3b06ff2d07dca19238fc\u0027:\n StrictMode: link to designing for responsiveness ANR docs\n" }, { "commit": "5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e", "tree": "07ed59d0686c831b2ef3498a501dbec560a2b836", "parents": [ "67fc4af9765d15c4e011c8127f9c06dfd0368bbe", "eb4ef07223030eb61d8cf99771e657b7fc0108d0" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Oct 13 12:27:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 12:27:08 2010 -0700" }, "message": "am eb4ef072: am 5249ad03: docs: add \"boot completed\" broadcast to list of DO NOTs for installing on external storage bug: 3088494\n\nMerge commit \u0027eb4ef07223030eb61d8cf99771e657b7fc0108d0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027eb4ef07223030eb61d8cf99771e657b7fc0108d0\u0027:\n docs: add \"boot completed\" broadcast to list of DO NOTs for installing on external storage\n" }, { "commit": "eb4ef07223030eb61d8cf99771e657b7fc0108d0", "tree": "f302867b55396e51355386488f3920ce861572a4", "parents": [ "527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a", "5249ad03454301744374d04e04b38aaad3b01530" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Oct 13 12:08:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 12:08:02 2010 -0700" }, "message": "am 5249ad03: docs: add \"boot completed\" broadcast to list of DO NOTs for installing on external storage bug: 3088494\n\nMerge commit \u00275249ad03454301744374d04e04b38aaad3b01530\u0027 into gingerbread\n\n* commit \u00275249ad03454301744374d04e04b38aaad3b01530\u0027:\n docs: add \"boot completed\" broadcast to list of DO NOTs for installing on external storage\n" }, { "commit": "5249ad03454301744374d04e04b38aaad3b01530", "tree": "f8243b371484f076c52387aba0a3b454e85f740b", "parents": [ "3fd40ee692ed1d4bca40e184119b0d1368671037" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Oct 12 17:08:23 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Oct 12 17:10:31 2010 -0700" }, "message": "docs: add \"boot completed\" broadcast to list of DO NOTs for installing on external storage\nbug: 3088494\n\nChange-Id: I9da318efb3d05d52eb8c2677e96da1bcf1cd542a\n" }, { "commit": "9c61f8fc0108649f4340160a9e0da9d9ee88d392", "tree": "2a9073d6749ceb17b0f6dd6bb8b31ff573fd5c14", "parents": [ "a310031438877a7b70a6ac30eb2f2b33e06907e6" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Tue Oct 12 14:36:59 2010 -0700" }, "committer": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Tue Oct 12 14:36:59 2010 -0700" }, "message": "DOC CHANGE: Fix bug in Testing doc\n\nChange-Id: Id432a40adfb6aef05a3e7c19425de54cb8a5f610\n" }, { "commit": "d555e2643f2bdc8b7e6096ce40943fcc56ec22d2", "tree": "910334b1129b8902e37065876f894c5eb3f2bf7f", "parents": [ "7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef", "354954a01c533c6789536c141cf330ddf3976e8b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Oct 12 14:18:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 14:18:33 2010 -0700" }, "message": "am 354954a0: Merge \"Doc change: cherrypick testing changes from master. Squashed commit of the following:\" into gingerbread\n\nMerge commit \u0027354954a01c533c6789536c141cf330ddf3976e8b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027354954a01c533c6789536c141cf330ddf3976e8b\u0027:\n Doc change: cherrypick testing changes from master. Squashed commit of the following:\n" }, { "commit": "354954a01c533c6789536c141cf330ddf3976e8b", "tree": "44ca327541699e187a997db1e1bfeea65c7540e0", "parents": [ "844a6b3ccaff1ad1443ad985e4527b733ce97c0e", "dafac622a4520fd8dde85807c7a6498937d80158" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Oct 12 14:16:05 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 12 14:16:05 2010 -0700" }, "message": "Merge \"Doc change: cherrypick testing changes from master. Squashed commit of the following:\" into gingerbread" }, { "commit": "4fe4d4c91cdfa59bb8161625be85252e187667a2", "tree": "6dd506d95402db1024a7d347fdcea3f885b8a978", "parents": [ "c8511af04a442551a204b1f47fabb317bcf54be0" ], "author": { "name": "Chris Palmer", "email": "palmer@google.com", "time": "Mon Oct 11 15:27:42 2010 -0700" }, "committer": { "name": "Chris Palmer", "email": "palmer@google.com", "time": "Tue Oct 12 13:28:11 2010 -0700" }, "message": "Update the documentation for content provider security.\n\nWithout this documentation fix, developers will not know that\napps on pre-Gingercomb devices will inadvertantly export their content\nproviders. With knowledge of the solid workaround, they can make their apps\nsecure.\n\nChange-Id: I1f096aff19500cd3d3fd2955a9dec59d8e7c6a73\n" }, { "commit": "4711d21a55d9ff6f234d3b06ff2d07dca19238fc", "tree": "d277a64193bd16b546245f10a3ea8f3c25a4f380", "parents": [ "4b255a23041225103a6870e77a236f78c2816eda", "9facd2d0847691ae46108713d6a7dc9f51a62135" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 12 08:23:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 08:23:40 2010 -0700" }, "message": "am 9facd2d0: Merge \"StrictMode: link to designing for responsiveness ANR docs\" into gingerbread\n\nMerge commit \u00279facd2d0847691ae46108713d6a7dc9f51a62135\u0027 into gingerbread-plus-aosp\n\n* commit \u00279facd2d0847691ae46108713d6a7dc9f51a62135\u0027:\n StrictMode: link to designing for responsiveness ANR docs\n" }, { "commit": "3fd40ee692ed1d4bca40e184119b0d1368671037", "tree": "e27b756e31420e918f6a2684f6f813120166f77b", "parents": [ "456fe3b337ef82aaf90c6428ec5be07028fc7d15" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 11 14:27:30 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 11 14:27:30 2010 -0700" }, "message": "Revert \"docs: new web apps dev guides\" Do not merge.\n\nThis reverts commit 65e62f4f908394fc469cf535fef7c16035a428a2.\n\nConflicts:\n\n\tdocs/html/guide/guide_toc.cs\n\nChange-Id: If6eb679a629bd4376043b2f49b6a82eacf71603d\n" }, { "commit": "9fc2fc5757a3d28d098bd2b0ad0f869a3cf3fa14", "tree": "f216816b8927f08b62b63a9f9952b1ec6407ee7c", "parents": [ "1010da2e02216b2f94fbe763a82d53201b340217" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Oct 11 12:52:35 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Oct 11 13:17:48 2010 -0700" }, "message": "StrictMode: link to designing for responsiveness ANR docs\n\nChange-Id: If65849aaa8317e7e40b2837b640a5cdb95fe7b0e\n" }, { "commit": "86d6f501e72a41886cb3aec0dcd9585581f8fe1e", "tree": "314a3aaeba1ce5405ce82946fe90869771a4e8a4", "parents": [ "0b6dfd78bb62cbfd0599f78cbf633046df7341c2", "59d5d966665dfebb1b03c4b1eba9eff3d9c797ce" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 11 09:43:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 09:43:49 2010 -0700" }, "message": "am 59d5d966: am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc\n\nMerge commit \u002759d5d966665dfebb1b03c4b1eba9eff3d9c797ce\u0027\n\n* commit \u002759d5d966665dfebb1b03c4b1eba9eff3d9c797ce\u0027:\n docs: a few style adjustments to admin doc\n" }, { "commit": "0b6dfd78bb62cbfd0599f78cbf633046df7341c2", "tree": "38a8953dc337362b42829cc0541e7e94c973ec7b", "parents": [ "d409cb1bf943b813c35538ba2a7dac1579815204", "1d58e52a59c3baf3475d8469c36c29c4051228bf" ], "author": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Mon Oct 11 09:22:57 2010 -0700" }, "committer": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Mon Oct 11 09:24:33 2010 -0700" }, "message": "resolved conflicts for merge of \u00271d58e52a\u0027 into master\n\nChange-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f\n" }, { "commit": "d9ae8ba9d9e71ed7708b0b22a631b40fe692b37d", "tree": "182d69f61616faa57a82bcf848ac2f402a7bf1cd", "parents": [ "764437aa9e9af4990969ea5124115f3df7fb1ec1", "7bfac24dcb5ec532b822507816929931e5e19002" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sun Oct 10 19:13:36 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 19:13:36 2010 -0700" }, "message": "am 7bfac24d: am d7170b2a: am 65e62f4f: docs: new web apps dev guides\n\nMerge commit \u00277bfac24dcb5ec532b822507816929931e5e19002\u0027\n\n* commit \u00277bfac24dcb5ec532b822507816929931e5e19002\u0027:\n docs: new web apps dev guides\n" }, { "commit": "dafac622a4520fd8dde85807c7a6498937d80158", "tree": "425d7371a437dda0b8f4b70db3881004a81ad126", "parents": [ "bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Sun Oct 10 13:20:12 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Sun Oct 10 13:20:12 2010 -0700" }, "message": "Doc change: cherrypick testing changes from master. Squashed commit of the following:\n\ncommit 3341f42f857058707c1c9f77dcfaecb22ff2f125\nAuthor: Joe Malin \u003cjmalin@google.com\u003e\nDate: Wed Sep 1 14:43:24 2010 -0700\n\n Doc Change: cherrypick from master -- add screenshots to Testing in Eclipse topic\n\n Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692\n\ncommit af2da09a6c69cac02fd1987a44d223d678b2484d\nAuthor: Dirk Dougherty \u003cddougherty@google.com\u003e\nDate: Sun Oct 10 12:39:55 2010 -0700\n\n Doc change: Cherrypick from master -- Testing Documentation in the Dev Guide tab\n\n Conflicts:\n\n \tdocs/html/guide/guide_toc.cs\n \tdocs/html/guide/topics/testing/testing_android.jd\n\n Change-Id: I6d2e7b7f69517e8aae3a1274596d2ecbd85cac50\n\nChange-Id: Ic6e547ce25c35060ec073b9da75e1d71b4946a85\n" }, { "commit": "59d5d966665dfebb1b03c4b1eba9eff3d9c797ce", "tree": "d9fb6a2b3137dd303726d57f94db6910578e19ba", "parents": [ "1d58e52a59c3baf3475d8469c36c29c4051228bf", "3d265b5775a74b1d5eb726238f13cf63e8465594" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 16:43:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 16:43:06 2010 -0700" }, "message": "am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc\n\nMerge commit \u00273d265b5775a74b1d5eb726238f13cf63e8465594\u0027 into gingerbread-plus-aosp\n\n* commit \u00273d265b5775a74b1d5eb726238f13cf63e8465594\u0027:\n docs: a few style adjustments to admin doc\n" }, { "commit": "3d265b5775a74b1d5eb726238f13cf63e8465594", "tree": "67ef362eb6ae71dab2bff0b18a0ef0e2ab47bdff", "parents": [ "7255288755661587958d384338d4808e76959d86", "50f86c65206072be0ca924f03b8d460365199bcd" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 16:39:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 16:39:08 2010 -0700" }, "message": "am 50f86c65: docs: a few style adjustments to admin doc\n\nMerge commit \u002750f86c65206072be0ca924f03b8d460365199bcd\u0027 into gingerbread\n\n* commit \u002750f86c65206072be0ca924f03b8d460365199bcd\u0027:\n docs: a few style adjustments to admin doc\n" }, { "commit": "1d58e52a59c3baf3475d8469c36c29c4051228bf", "tree": "406178d212840be49d160cda2b58ba658a1ab71f", "parents": [ "cac43e8a2ce59c1151d5a2028330b2a769591d22", "7255288755661587958d384338d4808e76959d86" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 16:37:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 16:37:51 2010 -0700" }, "message": "am 72552887: am 2e5a22aa: docs: remove old \"new\" tags from side nav\n\nMerge commit \u00277255288755661587958d384338d4808e76959d86\u0027 into gingerbread-plus-aosp\n\n* commit \u00277255288755661587958d384338d4808e76959d86\u0027:\n docs: remove old \"new\" tags from side nav\n" }, { "commit": "7255288755661587958d384338d4808e76959d86", "tree": "d357e073036eae6fef5db836b3daeddac083102d", "parents": [ "beffefa24f398b610d58dd583d9f5613dc529c28", "2e5a22aa3cd9ca81c82e93044dca6f36c395746d" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 16:30:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 16:30:47 2010 -0700" }, "message": "am 2e5a22aa: docs: remove old \"new\" tags from side nav\n\nMerge commit \u00272e5a22aa3cd9ca81c82e93044dca6f36c395746d\u0027 into gingerbread\n\n* commit \u00272e5a22aa3cd9ca81c82e93044dca6f36c395746d\u0027:\n docs: remove old \"new\" tags from side nav\n" }, { "commit": "50f86c65206072be0ca924f03b8d460365199bcd", "tree": "dea11e202a7c18ef28e5d717630bce84ab2e1e76", "parents": [ "2e5a22aa3cd9ca81c82e93044dca6f36c395746d" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 16:06:40 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 16:12:32 2010 -0700" }, "message": "docs: a few style adjustments to admin doc\n\nChange-Id: I1ea2416f1f26835b1111aad65cc519dd8d56e099\n" }, { "commit": "7bfac24dcb5ec532b822507816929931e5e19002", "tree": "ff054e9be7f4ea4f4ebdea9a04adf10dabe5f2a2", "parents": [ "4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635", "d7170b2a68dc9b9df6de9b063d25ff0ec20c86c4" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 15:55:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 15:55:40 2010 -0700" }, "message": "am d7170b2a: am 65e62f4f: docs: new web apps dev guides\n\nMerge commit \u0027d7170b2a68dc9b9df6de9b063d25ff0ec20c86c4\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d7170b2a68dc9b9df6de9b063d25ff0ec20c86c4\u0027:\n docs: new web apps dev guides\n" }, { "commit": "d7170b2a68dc9b9df6de9b063d25ff0ec20c86c4", "tree": "5ddeefa5a6d8d2771fc74d94b32c25243c078bdd", "parents": [ "a4682ed7547e895605d102ab17fc5c134b4ab38f", "65e62f4f908394fc469cf535fef7c16035a428a2" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 15:43:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 15:43:44 2010 -0700" }, "message": "am 65e62f4f: docs: new web apps dev guides\n\nMerge commit \u002765e62f4f908394fc469cf535fef7c16035a428a2\u0027 into gingerbread\n\n* commit \u002765e62f4f908394fc469cf535fef7c16035a428a2\u0027:\n docs: new web apps dev guides\n" }, { "commit": "2e5a22aa3cd9ca81c82e93044dca6f36c395746d", "tree": "c754e49fc09504611d99b3014def8c6af8279233", "parents": [ "65e62f4f908394fc469cf535fef7c16035a428a2" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 15:23:26 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 15:32:10 2010 -0700" }, "message": "docs: remove old \"new\" tags from side nav\n\nChange-Id: I9e5d1bf7688f5d30cd7b4c07b69b3f353dc67f92\n" }, { "commit": "65e62f4f908394fc469cf535fef7c16035a428a2", "tree": "ca09b0bde72a2899b32241124a318ec46651185a", "parents": [ "ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Sep 20 12:46:34 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Oct 08 15:19:27 2010 -0700" }, "message": "docs: new web apps dev guides\n\nChange-Id: I08b80de0544fec5d46a58e1c1b4c0e2ff1fd4fa2\n" }, { "commit": "1a469ca1cbdf7249b14101b7b0adbe0fe7014979", "tree": "e9c6a69e6a8468ad9918a8c7e215ac4f820a8ee3", "parents": [ "fe0ed4575e88d1786eb13eb942c5c0f0c4b43ac6", "2bd6afed6c4f101932b73dcbc6ec80b61e718568" ], "author": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Fri Oct 08 13:07:35 2010 -0700" }, "committer": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Fri Oct 08 13:09:31 2010 -0700" }, "message": "Resolved conflicts for merge of 2bd6afed to master\n\nChange-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9\n" }, { "commit": "2bd6afed6c4f101932b73dcbc6ec80b61e718568", "tree": "50a3e052e5ed3c30d2997c0f5366620524d0912c", "parents": [ "92d29c66f5cb69627172d21057e672eaba2eb03f", "b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4" ], "author": { "name": "Fred Chung", "email": "fchung@google.com", "time": "Tue Oct 05 23:45:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 05 23:45:29 2010 -0700" }, "message": "am b50d5ede: am 30264c9b: Merge \"Doc change: Adding new docs for Device Admin API.\" into froyo\n\nMerge commit \u0027b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4\u0027:\n Doc change: Adding new docs for Device Admin API.\n" } ], "next": "b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4" }