OSDN Git Service
Dirk Dougherty [Fri, 1 Feb 2013 22:26:03 +0000 (14:26 -0800)]
am
6cb87b08: am
65fd9811: am
2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
6cb87b088381f4c0cba334a1285d8d170458b793':
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Dirk Dougherty [Fri, 1 Feb 2013 22:25:58 +0000 (14:25 -0800)]
am
a929ea12: am
01084b96: am
3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
a929ea12d8291dee5804b3a9a1e5a54719224d41':
Doc change: remove duplicate image directory (use /sdk/images instead).
Scott Main [Fri, 1 Feb 2013 22:25:52 +0000 (14:25 -0800)]
am
78bf7c9c: am
1e7e1104: am
4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
78bf7c9c0c4ded4efe8a2bd7255ee1a1b0ec513e':
docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 22:25:45 +0000 (14:25 -0800)]
am
6dfb4d0a: am
5c37151c: am
e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
6dfb4d0a4ed8877c89f4dcfd76918af9da59dba5':
docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Fri, 1 Feb 2013 22:25:42 +0000 (14:25 -0800)]
am
2e5b2306: am
68d0f32c: am
48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
2e5b230639fc4946de962c3e53ed26685b8b54b8':
docs: update adb tool page with am and pm reference
Dirk Dougherty [Fri, 1 Feb 2013 22:25:39 +0000 (14:25 -0800)]
am
1417357e: am
f8a9c509: am
7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
1417357e005c7d751ecf95a7100bbc5ce3dbe669':
Add build rule for ds (devsite) online docs.
Dirk Dougherty [Fri, 1 Feb 2013 22:25:34 +0000 (14:25 -0800)]
am
36b58ea9: am
d6e176c8: am
2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
36b58ea919140a20c7bc4315becad5d6737d1a94':
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Adam Koch [Fri, 1 Feb 2013 22:25:29 +0000 (14:25 -0800)]
am
1826e8c3: am
3ef2c026: am
376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)
# Via Android Git Automerger (2) and Adam Koch (1)
* commit '
1826e8c36de8937652416c7702addc6fc7efc489':
Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
Dirk Dougherty [Fri, 1 Feb 2013 22:25:25 +0000 (14:25 -0800)]
am
fcd84aa0: am
daf487fe: am
df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
fcd84aa0a8d83490c2b6c14ed08b63297ca99a1b':
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Dirk Dougherty [Fri, 1 Feb 2013 22:22:20 +0000 (14:22 -0800)]
am
65fd9811: am
2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
65fd9811d3b00698ab25233543c2e49ef22c634b':
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Dirk Dougherty [Fri, 1 Feb 2013 22:22:16 +0000 (14:22 -0800)]
am
01084b96: am
3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
01084b96a15885698d602ee563dc8e18bf52acfa':
Doc change: remove duplicate image directory (use /sdk/images instead).
Scott Main [Fri, 1 Feb 2013 22:22:13 +0000 (14:22 -0800)]
am
1e7e1104: am
4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
1e7e1104c422d89393565bba591479c1ccbae06d':
docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 22:22:10 +0000 (14:22 -0800)]
am
5c37151c: am
e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
5c37151cb07519affba8e20018e0f0069d426527':
docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Fri, 1 Feb 2013 22:22:07 +0000 (14:22 -0800)]
am
68d0f32c: am
48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
68d0f32c09063e4ede569e84f8726dc1e96ab044':
docs: update adb tool page with am and pm reference
Dirk Dougherty [Fri, 1 Feb 2013 22:22:03 +0000 (14:22 -0800)]
am
f8a9c509: am
7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f8a9c5090c7b9e4cfd27bf65093939381746e638':
Add build rule for ds (devsite) online docs.
Dirk Dougherty [Fri, 1 Feb 2013 22:21:57 +0000 (14:21 -0800)]
am
d6e176c8: am
2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
d6e176c807d503beb1241ba73355a73ceca47e3e':
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Adam Koch [Fri, 1 Feb 2013 22:21:54 +0000 (14:21 -0800)]
am
3ef2c026: am
376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)
# Via Adam Koch (1) and Android Git Automerger (1)
* commit '
3ef2c0265439af10145be981407d63504e14d9f7':
Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
Dirk Dougherty [Fri, 1 Feb 2013 22:21:52 +0000 (14:21 -0800)]
am
daf487fe: am
df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
daf487fe22c0a7fe754390a0bfef5d6b28fdd12b':
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Dirk Dougherty [Fri, 1 Feb 2013 21:28:08 +0000 (13:28 -0800)]
am
2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
2aa47b336227a5d2bd1ee91f8fb4bd84be7e97f0':
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Dirk Dougherty [Fri, 1 Feb 2013 21:28:05 +0000 (13:28 -0800)]
am
3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
3b4b067baec59207640d534be86c7c6c12b06678':
Doc change: remove duplicate image directory (use /sdk/images instead).
Scott Main [Fri, 1 Feb 2013 21:28:01 +0000 (13:28 -0800)]
am
4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Scott Main
* commit '
4b7161cbd44f64537d2c661e87868ea2689dd126':
docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 21:27:57 +0000 (13:27 -0800)]
am
e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Scott Main
* commit '
e75cd4bfd176fbb1483ec5e17edfbd993adce40f':
docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Fri, 1 Feb 2013 21:27:51 +0000 (13:27 -0800)]
am
48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
48f9f83ba27bf3a5cac224e30821836b3956c87c':
docs: update adb tool page with am and pm reference
Dirk Dougherty [Fri, 1 Feb 2013 21:27:48 +0000 (13:27 -0800)]
am
7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
7b32d32bd38b423dd141e7ead89205b9b7929497':
Add build rule for ds (devsite) online docs.
Dirk Dougherty [Fri, 1 Feb 2013 21:27:35 +0000 (13:27 -0800)]
am
2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
2c1669c427826fba48ae7776e34f90cdcc5a3a20':
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Adam Koch [Fri, 1 Feb 2013 21:27:26 +0000 (13:27 -0800)]
am
376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)
# Via Adam Koch
* commit '
376e707f65b3ee6e00953466d6367642d2a02b4b':
Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
Dirk Dougherty [Fri, 1 Feb 2013 21:27:19 +0000 (13:27 -0800)]
am
df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Dirk Dougherty
* commit '
df9fa4c602e986495fe8795fb800858b48693040':
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Xia Wang [Thu, 31 Jan 2013 02:59:22 +0000 (18:59 -0800)]
am
f3ef10b1: am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f3ef10b12b61891962eb6253e95c8c9eec82d383':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:57:50 +0000 (18:57 -0800)]
am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and Xia Wang (1)
* commit '
2297d1e78cc70d4e19d9e7c66d24fc494455166c':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:54:55 +0000 (02:54 +0000)]
Merge "Fix WiFi test:" into jb-mr1.1-dev
Xia Wang [Wed, 30 Jan 2013 23:02:21 +0000 (15:02 -0800)]
Fix WiFi test:
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
to avoid that, change the test to connect without scanning.
-- Increase the timer to wait for WiFi to be connected
Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
Dirk Dougherty [Tue, 29 Jan 2013 23:40:00 +0000 (23:40 +0000)]
Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
Dirk Dougherty [Tue, 29 Jan 2013 23:00:04 +0000 (15:00 -0800)]
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Change-Id: I9cfa53e605f476daf6cf914f256df600e1d77f89
Dirk Dougherty [Tue, 29 Jan 2013 23:09:41 +0000 (23:09 +0000)]
Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
Dirk Dougherty [Tue, 29 Jan 2013 22:26:02 +0000 (14:26 -0800)]
Doc change: remove duplicate image directory (use /sdk/images instead).
Change-Id: If987d7a31d8b9dc203e9d224a59aeeab8aa5297f
Scott Main [Tue, 29 Jan 2013 22:20:13 +0000 (14:20 -0800)]
docs: switch devsite doc build to use templates-sdk
Change-Id: I933cbafa0712de47b4bcf72d2a7c4f99bf18f930
Doug Zongker [Tue, 29 Jan 2013 17:05:21 +0000 (09:05 -0800)]
add android.permission.LOOP_RADIO for access to loop radio device
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
Scott Main [Tue, 29 Jan 2013 16:29:40 +0000 (08:29 -0800)]
docs: add hdf bool for deviste, used to change aspects of the templates
Change-Id: I6ad24252f10211a88d1f98e356bc9da97442f91c
Scott Main [Tue, 29 Jan 2013 00:49:05 +0000 (00:49 +0000)]
Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
Dirk Dougherty [Tue, 29 Jan 2013 00:40:57 +0000 (00:40 +0000)]
Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
Dirk Dougherty [Mon, 28 Jan 2013 23:43:49 +0000 (15:43 -0800)]
Add build rule for ds (devsite) online docs.
Change-Id: I4f1d099995402613f58401a506ba272abfb563ba
Dirk Dougherty [Mon, 28 Jan 2013 21:26:01 +0000 (21:26 +0000)]
Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
Dirk Dougherty [Mon, 28 Jan 2013 20:19:24 +0000 (12:19 -0800)]
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Change-Id: Ib33511f75b72a8019fffb13d396b608cf8e270d2
Adam Koch [Mon, 28 Jan 2013 18:58:14 +0000 (13:58 -0500)]
Displaying Bitmaps Efficiently Training - Update sample app
Update sample app zip (see http://ag/268000)
Change-Id: I678b9286552d559358b0e58cbac0475dbe5e10a1
Scott Main [Thu, 10 Jan 2013 02:46:57 +0000 (18:46 -0800)]
docs: update adb tool page with am and pm reference
Change-Id: I7b0e5c95a0d98b91c0a8ed39962b52f8ace47c3b
Dirk Dougherty [Thu, 29 Nov 2012 21:09:21 +0000 (13:09 -0800)]
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Change-Id: I0bf0c691db8f190215f95ab8659e28fd73a496d7
Adam Powell [Wed, 23 Jan 2013 23:46:20 +0000 (15:46 -0800)]
am
17f05497: am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '
17f05497be90004c0263c6de173af8c19ece07b0':
Touch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 23:44:47 +0000 (15:44 -0800)]
am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '
c246950043c4c48beb51d5b56d94473e77c5fad2':
Touch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 23:42:31 +0000 (23:42 +0000)]
Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
Adam Powell [Wed, 23 Jan 2013 23:25:50 +0000 (15:25 -0800)]
am
65083049: am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '
650830491868b961e98c1837fb4b4ce7917783b5':
Prevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 23:24:18 +0000 (15:24 -0800)]
am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '
5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
Prevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 23:20:56 +0000 (23:20 +0000)]
Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
Adam Powell [Wed, 23 Jan 2013 02:55:20 +0000 (18:55 -0800)]
Touch action bar title text: you will go to space today!
Title/subtitle text in an action bar is now a full alias for home/up.
Add some prototype ActionBar functionality around titles for future
API consideration.
Bug
7966136
Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
Adam Powell [Wed, 23 Jan 2013 22:23:06 +0000 (14:23 -0800)]
Prevent simultaneous interaction with action bar and content
Bug
8034744
Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
Amith Yamasani [Tue, 22 Jan 2013 23:46:25 +0000 (15:46 -0800)]
am
2c64b539: am
596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '
2c64b53976a99f28bc7c0612648581f9b93bf8b0':
Properly initialize recognition service if the recognizer component changed.
Amith Yamasani [Tue, 22 Jan 2013 23:43:53 +0000 (15:43 -0800)]
am
596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '
596532d9dbea3460dbc989b0316c721ca69f4915':
Properly initialize recognition service if the recognizer component changed.
Amith Yamasani [Fri, 18 Jan 2013 19:04:09 +0000 (11:04 -0800)]
Properly initialize recognition service if the recognizer component changed.
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.
Bug:
8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
Dake Gu [Fri, 18 Jan 2013 21:22:26 +0000 (21:22 +0000)]
Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev
Victoria Lease [Fri, 18 Jan 2013 18:51:25 +0000 (10:51 -0800)]
am
3599f0a0: (-s ours) am
0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev
* commit '
3599f0a02129c238177806ce3d6db20853230d4d':
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Victoria Lease [Fri, 18 Jan 2013 18:49:07 +0000 (10:49 -0800)]
am
0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev
* commit '
0cf97d32178b689184866e731c0a4105d8223d80':
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Victoria Lease [Fri, 18 Jan 2013 18:42:36 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev
Robert Ly [Fri, 18 Jan 2013 18:31:48 +0000 (10:31 -0800)]
am
6d59e0ea: am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
6d59e0ead242978eff8a64d314a1f8554694d8a6':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:28:41 +0000 (10:28 -0800)]
am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
a239b933f7982ed069ccd284b4eab0fb5e4b6505':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:23:29 +0000 (10:23 -0800)]
am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
548e17dfdbd862cdfc663268a6d67b47f42b9544':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:20:29 +0000 (18:20 +0000)]
Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
Dake Gu [Thu, 17 Jan 2013 21:39:01 +0000 (13:39 -0800)]
Fix bug of SimulatedTrackball
Simulated trackball should not generate KeyEvent if dispatchGenericMotionEvent
returns true
b/
8022205
Change-Id: I1857e25407c508c98ef4db85fe146b1e25a0803e
Roman Nurik [Wed, 9 Jan 2013 16:35:53 +0000 (08:35 -0800)]
docs: Add PageTransformer to animations training class
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
Andy McFadden [Thu, 17 Jan 2013 20:14:24 +0000 (12:14 -0800)]
Andy McFadden [Thu, 17 Jan 2013 20:11:47 +0000 (12:11 -0800)]
am
ee3a1d5e: am
9b6687bb: Fix code snippet
* commit '
ee3a1d5ecefe3d67df40c53de892b56ddf71bc81':
Fix code snippet
Andy McFadden [Thu, 17 Jan 2013 20:09:40 +0000 (12:09 -0800)]
am
9b6687bb: Fix code snippet
* commit '
9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
Fix code snippet
Dirk Dougherty [Thu, 17 Jan 2013 19:55:49 +0000 (11:55 -0800)]
am
ce15192c: am
4a0f95cf: am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
ce15192c72a3491f632d8cee89f2f58da1e4e0b6':
Doc change: Fix urls to work properly with https.
Andy McFadden [Tue, 15 Jan 2013 20:26:04 +0000 (12:26 -0800)]
Fix code snippet
One of the examples was incorrect (both here and in the original).
http://b.android.com/42776
Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
Victoria Lease [Wed, 16 Jan 2013 20:51:04 +0000 (12:51 -0800)]
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03
Conflicts:
services/java/com/android/server/ServiceWatcher.java
Dirk Dougherty [Thu, 17 Jan 2013 00:39:17 +0000 (16:39 -0800)]
am
4a0f95cf: am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
4a0f95cffbb9925e95c216aea41f3450885d4061':
Doc change: Fix urls to work properly with https.
Dirk Dougherty [Thu, 17 Jan 2013 00:37:03 +0000 (16:37 -0800)]
am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
3987f6c1793bd44305c491e9b57134a1df285599':
Doc change: Fix urls to work properly with https.
Dirk Dougherty [Thu, 17 Jan 2013 00:30:09 +0000 (00:30 +0000)]
Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
Justin Koh [Thu, 17 Jan 2013 00:11:44 +0000 (00:11 +0000)]
Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
Justin Koh [Wed, 16 Jan 2013 22:51:29 +0000 (14:51 -0800)]
Remove doSingleCrunch call DO NOT MERGE
Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.
Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
Scott Kennedy [Wed, 16 Jan 2013 18:13:02 +0000 (10:13 -0800)]
Scott Main [Wed, 16 Jan 2013 18:12:59 +0000 (10:12 -0800)]
am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
841c3491143e4946586caa7fe7cd4691d044ce62':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:12:56 +0000 (10:12 -0800)]
am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
de902da2c1f9e133de69267b5dbb122bce15adbc':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:09:46 +0000 (10:09 -0800)]
am
3332aa98: am
d7ec742c: docs: Minor typos
* commit '
3332aa985280d7e84c7cb70c33610efdd24873d7':
docs: Minor typos
Scott Main [Wed, 16 Jan 2013 18:09:46 +0000 (10:09 -0800)]
am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
ceddf9f8e824573d7e6be4b21edf0ffb89c7c929':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:08:08 +0000 (10:08 -0800)]
am
d7ec742c: docs: Minor typos
* commit '
d7ec742c30be95da4d20930dd5000897bfe3f127':
docs: Minor typos
Scott Main [Tue, 15 Jan 2013 19:18:48 +0000 (11:18 -0800)]
docs: put new devbytes playlist on the develop landing
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
Dirk Dougherty [Wed, 16 Jan 2013 03:57:25 +0000 (19:57 -0800)]
Doc change: Fix urls to work properly with https.
Change-Id: I8bc996dff0a0b44992987f93019a2a5be40430cd
Scott Kennedy [Wed, 16 Jan 2013 03:33:56 +0000 (19:33 -0800)]
docs: Minor typos
One of these was mentioned in a comment in external 40435
Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4
Scott Main [Tue, 15 Jan 2013 23:25:04 +0000 (15:25 -0800)]
am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
3c3995f5ab2d0bc38cd06effdd65395a6a9a0ac3':
docs: put new devbytes playlist on the develop landing
Scott Main [Tue, 15 Jan 2013 23:20:23 +0000 (15:20 -0800)]
Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
Scott Kennedy [Tue, 15 Jan 2013 22:52:32 +0000 (14:52 -0800)]
am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
ff5b73933a0444aae30e3a1a41bb31d19f7ff649':
docs: Another fix for external 42607
Scott Main [Tue, 15 Jan 2013 22:52:29 +0000 (14:52 -0800)]
am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
946d68f3d0e0a10753cc6566766f149d779f45b6':
docs: add download ZIPs for chet's devbyte samples
Scott Kennedy [Tue, 15 Jan 2013 22:50:15 +0000 (14:50 -0800)]
am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
39ea055f9e1b697db0dee197818be8de608e461f':
docs: Another fix for external 42607
Scott Main [Tue, 15 Jan 2013 22:50:12 +0000 (14:50 -0800)]
am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
9ac31a78c85f2246cf49ff4a89a91e44375b1d56':
docs: add download ZIPs for chet's devbyte samples
Xavier Ducrohet [Tue, 15 Jan 2013 22:48:02 +0000 (14:48 -0800)]
am
6080cc5f: resolved conflicts for merge of
dd52dfed to jb-mr1.1-ub-dev
* commit '
6080cc5fd7c332c79098a50605c0c37d99d4c481':
Fix the single crunch command to return the right error code.
Scott Kennedy [Tue, 15 Jan 2013 22:29:20 +0000 (14:29 -0800)]
am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
335da367a167d11eefb9d8127b9423093213bcc8':
docs: Another fix for external 42607
Xavier Ducrohet [Tue, 15 Jan 2013 22:24:56 +0000 (14:24 -0800)]
resolved conflicts for merge of
dd52dfed to jb-mr1.1-ub-dev
Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0
Scott Kennedy [Tue, 15 Jan 2013 22:24:24 +0000 (14:24 -0800)]
Merge "docs: Another fix for external 42607" into jb-mr1-dev
Scott Main [Tue, 15 Jan 2013 19:18:48 +0000 (11:18 -0800)]
docs: put new devbytes playlist on the develop landing
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
Scott Main [Tue, 15 Jan 2013 19:11:16 +0000 (11:11 -0800)]
am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
ec171f3f48f49cffc49bf36d2d65a76489351034':
docs: add download ZIPs for chet's devbyte samples
Scott Main [Tue, 15 Jan 2013 19:03:49 +0000 (11:03 -0800)]
docs: add download ZIPs for chet's devbyte samples
Change-Id: I06ec87729afe2c5b161ae7877f2cc012db60db2f