OSDN Git Service
Dirk Dougherty [Thu, 17 Jan 2013 20:03:33 +0000 (12:03 -0800)]
am
dde7f846: am
dae2ac6f: am
d275891a: am
ce15192c: am
4a0f95cf: am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
dde7f8469143cb32e0f924a0d138ca448ab3468f':
Doc change: Fix urls to work properly with https.
Dirk Dougherty [Thu, 17 Jan 2013 20:01:48 +0000 (12:01 -0800)]
am
dae2ac6f: am
d275891a: am
ce15192c: am
4a0f95cf: am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
dae2ac6f22bd5ab42d54365eedc1ea7dac0db360':
Doc change: Fix urls to work properly with https.
Dirk Dougherty [Thu, 17 Jan 2013 19:59:18 +0000 (11:59 -0800)]
am
d275891a: am
ce15192c: am
4a0f95cf: am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
d275891a8aceab307746befcc0be08f4a73e99c2':
Doc change: Fix urls to work properly with https.
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.
Elliott Hughes [Thu, 17 Jan 2013 19:39:56 +0000 (11:39 -0800)]
am
ec6afcc6: am
8c27d0b3: am
686fad5e: am
b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '
ec6afcc69ae35a0b1f22f44a70fbe4ce5a17be41':
Track a typo fix in hidden libcore API.
Elliott Hughes [Thu, 17 Jan 2013 19:39:53 +0000 (11:39 -0800)]
am
ebf724b6: (-s ours) am
2d40f625: (-s ours) Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
* commit '
ebf724b6414bc92e5e034b31ef1a81d9beb05cd7':
DO NOT MERGE Fix build.
Elliott Hughes [Thu, 17 Jan 2013 19:34:38 +0000 (11:34 -0800)]
am
8c27d0b3: am
686fad5e: am
b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '
8c27d0b3093593fe0d2c229ffcc9a35dbaf5fc59':
Track a typo fix in hidden libcore API.
Elliott Hughes [Thu, 17 Jan 2013 19:34:23 +0000 (11:34 -0800)]
am
2d40f625: (-s ours) Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
* commit '
2d40f625c457d93cd7fabb0ca8ea360519f40da9':
DO NOT MERGE Fix build.
Elliott Hughes [Thu, 17 Jan 2013 18:32:00 +0000 (10:32 -0800)]
am
686fad5e: am
b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '
686fad5e2367fe08afe6e219d460be994127fb5e':
Track a typo fix in hidden libcore API.
Elliott Hughes [Thu, 17 Jan 2013 18:28:43 +0000 (10:28 -0800)]
am
b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '
b1e16f11ffd3a391be1a44a352c122b6dad1e8a5':
Track a typo fix in hidden libcore API.
Elliott Hughes [Thu, 17 Jan 2013 18:19:49 +0000 (18:19 +0000)]
Merge "Track a typo fix in hidden libcore API."
Elliott Hughes [Thu, 17 Jan 2013 17:24:47 +0000 (09:24 -0800)]
Track a typo fix in hidden libcore API.
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
Robert Greenwalt [Thu, 17 Jan 2013 17:08:33 +0000 (09:08 -0800)]
am
0f8d1553: Merge "Second pass tying into dns cache per interface"
* commit '
0f8d155363c361199a9d9aa5dcdbc4088990f893':
Second pass tying into dns cache per interface
Junichi Monma [Thu, 17 Jan 2013 17:08:30 +0000 (09:08 -0800)]
am
6d191ed9: Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
* commit '
6d191ed99491f209168e88f3d570e89c6836285b':
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
Dianne Hackborn [Thu, 17 Jan 2013 17:08:27 +0000 (09:08 -0800)]
am
2125dd57: Merge "AppOps: fix nested op tracking, new API to get apps using permissions."
* commit '
2125dd57cc3c1c43da9793a2ee4bb8a7bf19f083':
AppOps: fix nested op tracking, new API to get apps using permissions.
Victoria Lease [Thu, 17 Jan 2013 17:08:22 +0000 (09:08 -0800)]
am
b2efa40b: Merge "Prevent OOM death for services under ServiceWatcher\'s care."
* commit '
b2efa40bc37bc83410ef38652f708ea7ef6ab845':
Prevent OOM death for services under ServiceWatcher's care.
Elliott Hughes [Thu, 17 Jan 2013 17:02:37 +0000 (17:02 +0000)]
Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
Robert Greenwalt [Thu, 17 Jan 2013 16:15:28 +0000 (16:15 +0000)]
Merge "Second pass tying into dns cache per interface"
Junichi Monma [Thu, 17 Jan 2013 07:13:22 +0000 (16:13 +0900)]
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
bug id : b/
8023135
Change-Id: Ie9a69f480026302ff949fdf2b4089e4d95a38fb0
Dianne Hackborn [Thu, 17 Jan 2013 02:51:09 +0000 (02:51 +0000)]
Merge "AppOps: fix nested op tracking, new API to get apps using permissions."
Dianne Hackborn [Thu, 17 Jan 2013 01:56:46 +0000 (17:56 -0800)]
AppOps: fix nested op tracking, new API to get apps using
permissions.
Change-Id: I20c7bd58febc01d6911a90440867eaacd133c464
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.
Victoria Lease [Thu, 17 Jan 2013 00:33:17 +0000 (00:33 +0000)]
Merge "Prevent OOM death for services under ServiceWatcher's care."
Winson Chung [Thu, 17 Jan 2013 00:31:22 +0000 (16:31 -0800)]
am
103bc334: Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)"
* commit '
103bc3342efe2a8a9a3a26f2e115bd1b58e0ed77':
Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)
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
Winson Chung [Thu, 17 Jan 2013 00:27:19 +0000 (00:27 +0000)]
Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)"
Justin Koh [Thu, 17 Jan 2013 00:25:38 +0000 (16:25 -0800)]
am
b16dcd14: (-s ours) am
73d94a30: (-s ours) am
ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
* commit '
b16dcd14b5d4bb44cdb4bdab04f2fa59bef3f524':
Remove doSingleCrunch call DO NOT MERGE
Justin Koh [Thu, 17 Jan 2013 00:23:32 +0000 (16:23 -0800)]
am
73d94a30: (-s ours) am
ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
* commit '
73d94a30a25aec25e27aa1d0a328f033465461c0':
Remove doSingleCrunch call DO NOT MERGE
Victoria Lease [Wed, 16 Jan 2013 20:51:04 +0000 (12:51 -0800)]
Prevent OOM death for services under ServiceWatcher's care.
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03
Justin Koh [Thu, 17 Jan 2013 00:21:28 +0000 (16:21 -0800)]
am
ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
* commit '
ba1992f8e9e50ca58f007ff528d2f6d2c2b18223':
Remove doSingleCrunch call DO NOT MERGE
Amith Yamasani [Thu, 17 Jan 2013 00:13:34 +0000 (16:13 -0800)]
am
5ebefec5: Merge "Fix test build failure"
* commit '
5ebefec5bdb99a646e338997617d46e3ae0162ed':
Fix test build failure
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
Amith Yamasani [Thu, 17 Jan 2013 00:10:16 +0000 (00:10 +0000)]
Merge "Fix test build failure"
Amith Yamasani [Thu, 17 Jan 2013 00:04:00 +0000 (16:04 -0800)]
Fix test build failure
Change-Id: Ic96c2490439a78af2fb92db49b25b67b56954a20
Dianne Hackborn [Wed, 16 Jan 2013 23:39:47 +0000 (15:39 -0800)]
Dianne Hackborn [Wed, 16 Jan 2013 23:35:39 +0000 (23:35 +0000)]
Merge "Fix build."
Dianne Hackborn [Wed, 16 Jan 2013 23:34:35 +0000 (15:34 -0800)]
Fix build.
Change-Id: I068539623b3b133793fc9b8188d876eca59a8281
Amith Yamasani [Wed, 16 Jan 2013 23:30:21 +0000 (15:30 -0800)]
am
d4fe37be: Merge "Rename bindService to bindServiceAsUser to follow convention."
* commit '
d4fe37bee7c7433f32c23cee100c6e05ba0f3b2b':
Rename bindService to bindServiceAsUser to follow convention.
Amith Yamasani [Wed, 16 Jan 2013 23:26:30 +0000 (23:26 +0000)]
Merge "Rename bindService to bindServiceAsUser to follow convention."
Jeff Sharkey [Wed, 16 Jan 2013 23:18:09 +0000 (15:18 -0800)]
am
d05efe72: Merge "Create directory on background thread."
* commit '
d05efe727b61e321a6c2720166988d52629c050c':
Create directory on background thread.
Jeff Sharkey [Wed, 16 Jan 2013 23:09:27 +0000 (23:09 +0000)]
Merge "Create directory on background thread."
Jeff Sharkey [Wed, 16 Jan 2013 23:07:37 +0000 (15:07 -0800)]
Create directory on background thread.
Bug:
7726949
Change-Id: I707431075055cddb8da2c2bca37e91a846938dce
Jeff Sharkey [Wed, 16 Jan 2013 23:03:26 +0000 (15:03 -0800)]
am
b34cbc1f: Merge "Create screenshot directory if missing."
* commit '
b34cbc1f663ab59a693abfb4dba0d66799fdd456':
Create screenshot directory if missing.
Winson Chung [Wed, 16 Jan 2013 22:59:18 +0000 (14:59 -0800)]
Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)
Change-Id: Icb71d28eb80105757026d7fac530db936b327500
Jeff Sharkey [Wed, 16 Jan 2013 23:00:56 +0000 (23:00 +0000)]
Merge "Create screenshot directory if missing."
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
Jeff Sharkey [Wed, 16 Jan 2013 22:38:49 +0000 (14:38 -0800)]
Create screenshot directory if missing.
Also use File to build paths instead of String template.
Bug:
7726949
Change-Id: I9aa0e6a0890c5450fe11e8007f8f4cb2e3287256
Siva Velusamy [Wed, 16 Jan 2013 22:26:05 +0000 (14:26 -0800)]
am
281184fb: Merge "Support hierarchy viewer commands via DDM"
* commit '
281184fb86a1866b3e8f8a0d8b38a1aa934849dc':
Support hierarchy viewer commands via DDM
Siva Velusamy [Wed, 16 Jan 2013 22:23:39 +0000 (22:23 +0000)]
Merge "Support hierarchy viewer commands via DDM"
Amith Yamasani [Wed, 16 Jan 2013 20:30:11 +0000 (12:30 -0800)]
Rename bindService to bindServiceAsUser to follow convention.
This is for the multi-user version of bindService, not the original.
Change-Id: Ib2de35941196accf387b1a276a77e6f9af805ec0
Dianne Hackborn [Wed, 16 Jan 2013 20:14:53 +0000 (12:14 -0800)]
am
35654b61: More work on App Ops service.
* commit '
35654b61e8fe7bc85afcb076ddbb590d51c5865f':
More work on App Ops service.
Dianne Hackborn [Tue, 15 Jan 2013 01:38:02 +0000 (17:38 -0800)]
More work on App Ops service.
Implemented reading and writing state to retain information
across boots, API to retrieve state from it, improved location
manager interaction to monitor both coarse and fine access
and only note operations when location data is being delivered
back to app (not when it is just registering to get the data at
some time in the future).
Also implement tracking of read/write ops on contacts and the
call log. This involved tweaking the content provider protocol
to pass over the name of the calling package, and some
infrastructure in the ContentProvider transport to note incoming
calls with the app ops service. The contacts provider and call
log provider turn this on for themselves.
This also implements some of the mechanics of being able to ignore
incoming provider calls... all that is left are some new APIs for
the real content provider implementation to be involved with
providing the correct behavior for query() (return an empty
cursor with the right columns) and insert() (need to figure out
what URI to return).
Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
Elliott Hughes [Wed, 16 Jan 2013 19:10:36 +0000 (11:10 -0800)]
DO NOT MERGE Fix build.
Looks like a method that won't compile was left behind as part of
a merge conflict resolution.
Change-Id: I75eabc0c626a619a666642c7c685e4ce544095e7
Scott Kennedy [Wed, 16 Jan 2013 18:20:48 +0000 (10:20 -0800)]
Scott Main [Wed, 16 Jan 2013 18:20:45 +0000 (10:20 -0800)]
am
35909a08: am
465ef7f2: am
6f8fe8dd: am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
35909a0879b72b1f253b4d5bf38ed0a691c73a95':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:20:38 +0000 (10:20 -0800)]
am
258d6d74: am
5c7c1468: am
29502977: am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
258d6d74dc31d27d7edc40f5238d3c9be32ed412':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:18:02 +0000 (10:18 -0800)]
Scott Main [Wed, 16 Jan 2013 18:17:58 +0000 (10:17 -0800)]
am
465ef7f2: am
6f8fe8dd: am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
465ef7f2a2b1af43657d83bc1d12b8d646a6e335':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:17:53 +0000 (10:17 -0800)]
am
5c7c1468: am
29502977: am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
5c7c1468f71186488e91fe550777cd16e3e07645':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:15:54 +0000 (10:15 -0800)]
Scott Main [Wed, 16 Jan 2013 18:15:51 +0000 (10:15 -0800)]
am
6f8fe8dd: am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
6f8fe8dd4af55fb45ba9002cb0c36c8818a0b030':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:15:47 +0000 (10:15 -0800)]
am
29502977: am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
29502977fc4b4e05868775b9153714d4d6d050c1':
docs: put new devbytes playlist on the develop landing
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
Siva Velusamy [Mon, 7 Jan 2013 00:03:12 +0000 (16:03 -0800)]
Support hierarchy viewer commands via DDM
Hierarchy Viewer currently interfaces to the host via a socket
opened by ViewServer which resides in the WindowManagerService.
Since this has access to all windows, it is enabled only on
debug builds.
This CL adds necessary support to DDM to handle all the commands
required for Hierarchy Viewer. It only misses two commands that
are sent to the Window Manager (which we don't have access to
from the applications).
A future CL will remove the ViewServer functionality.
Change-Id: I1dae316a00737b0cae4e640ccc97bf9bb1d05973
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
Kristian Monsen [Wed, 16 Jan 2013 04:20:08 +0000 (20:20 -0800)]
am
2d76d4f3: Fix build break in master-chromium
* commit '
2d76d4f35ca8d0bcb45159555aa7715b7070a751':
Fix build break in master-chromium
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
Kristian Monsen [Wed, 16 Jan 2013 03:23:21 +0000 (19:23 -0800)]
Fix build break in master-chromium
Include needed headers and sort them correctly.
Change-Id: I8557c98234d86f4d0b105182f4f191a826c9aeb5
Xia Wang [Wed, 16 Jan 2013 02:06:21 +0000 (18:06 -0800)]
am
b6cf3c02: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks."
* commit '
b6cf3c02de06dfe2358009e3811055fdef7e10b0':
Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
Xia Wang [Wed, 16 Jan 2013 02:02:59 +0000 (18:02 -0800)]
Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks."
Xia Wang [Wed, 21 Nov 2012 03:03:06 +0000 (19:03 -0800)]
Fix image processing test to include all benchmark tests
-- each test case can be excuted separately
-- add a test case to run all benchmarks.
Change-Id: I3c61dfe50267a6db11bc1895a4f37ed618a9103b
Sasha Levitskiy [Wed, 16 Jan 2013 00:59:50 +0000 (16:59 -0800)]
am
f849124b: Merge "Removed Throttle Manager as obsolete"
* commit '
f849124b6bc769bdaf98909279124ff9716c9107':
Removed Throttle Manager as obsolete
Sasha Levitskiy [Wed, 16 Jan 2013 00:55:41 +0000 (16:55 -0800)]
Merge "Removed Throttle Manager as obsolete"
Scott Kennedy [Wed, 16 Jan 2013 00:54:52 +0000 (16:54 -0800)]
am
278afa73: am
7e553e15: am
d50a0383: am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
278afa73b21023856aa5b39436138abe1b1271bf':
docs: Another fix for external 42607
Scott Main [Wed, 16 Jan 2013 00:54:48 +0000 (16:54 -0800)]
am
61963e88: am
67db4218: am
7fb1b8c6: am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
61963e88d9af350ce46b135e3fc850e738e14830':
docs: add download ZIPs for chet's devbyte samples
Scott Kennedy [Wed, 16 Jan 2013 00:52:14 +0000 (16:52 -0800)]
am
7e553e15: am
d50a0383: am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
7e553e15d9f903f01e7038bd691aaa94e4524b97':
docs: Another fix for external 42607
Scott Main [Wed, 16 Jan 2013 00:52:11 +0000 (16:52 -0800)]
am
67db4218: am
7fb1b8c6: am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
67db4218edf93ee3db36f9ac0e10682ed74f4150':
docs: add download ZIPs for chet's devbyte samples
Yorke Lee [Wed, 16 Jan 2013 00:49:58 +0000 (16:49 -0800)]
am
30244d92: Merge "Fix the build breakage due to incorrect javadoc link"
* commit '
30244d92390bde94b1c87aa855fd4dd2c7cfaa20':
Fix the build breakage due to incorrect javadoc link
Xavier Ducrohet [Wed, 16 Jan 2013 00:47:29 +0000 (16:47 -0800)]
am
b7de2194: resolved conflicts for merge of
c71c678e to master
* commit '
b7de2194d54eb81b1db4b50c171ddd0339831155':
Fix the single crunch command to return the right error code.
Yorke Lee [Wed, 16 Jan 2013 00:47:17 +0000 (16:47 -0800)]
Merge "Fix the build breakage due to incorrect javadoc link"
Yorke Lee [Wed, 16 Jan 2013 00:46:00 +0000 (16:46 -0800)]
Fix the build breakage due to incorrect javadoc link
Change-Id: I1789f7e324a06c45c1be4088e9bd4e5cd6879aee
Xavier Ducrohet [Wed, 16 Jan 2013 00:41:29 +0000 (16:41 -0800)]
resolved conflicts for merge of
c71c678e to master
Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
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
Raph Levien [Tue, 15 Jan 2013 23:02:51 +0000 (15:02 -0800)]
am
e45113a1: Merge "Attempt to resolve build breakage on x86"
* commit '
e45113a1564c6e701fcc076813bee276d501c576':
Attempt to resolve build breakage on x86
Raph Levien [Tue, 15 Jan 2013 22:58:17 +0000 (14:58 -0800)]
Merge "Attempt to resolve build breakage on x86"
Scott Kennedy [Tue, 15 Jan 2013 22:54:22 +0000 (14:54 -0800)]
am
d50a0383: am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
d50a038340935a0ea8cf8fadce7e21b640b58db0':
docs: Another fix for external 42607
Scott Main [Tue, 15 Jan 2013 22:54:18 +0000 (14:54 -0800)]
am
7fb1b8c6: am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
7fb1b8c61337313de6566b1afa6886ceb368dd50':
docs: add download ZIPs for chet's devbyte samples
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
Xavier Ducrohet [Tue, 15 Jan 2013 22:50:37 +0000 (14:50 -0800)]
am
a4e10cc7: am
6080cc5f: resolved conflicts for merge of
dd52dfed to jb-mr1.1-ub-dev
* commit '
a4e10cc746caea514216f436e2065b3bbefb25ef':
Fix the single crunch command to return the right error code.
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