OSDN Git Service
Quddus Chong [Mon, 19 May 2014 21:02:57 +0000 (21:02 +0000)]
am
4b2b91d4: am
47064793: am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
4b2b91d47c1430f3c69893466cf2b8b025876888':
docs: Updated Javadoc for GMS Kenafa release.
Quddus Chong [Mon, 19 May 2014 20:58:41 +0000 (20:58 +0000)]
am
47064793: am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
4706479326789b4b20cc370cdb28c7a0b4f09646':
docs: Updated Javadoc for GMS Kenafa release.
Quddus Chong [Mon, 19 May 2014 20:55:31 +0000 (20:55 +0000)]
am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
f4b6449515f212642e90e435b2a3a55766a41f9e':
docs: Updated Javadoc for GMS Kenafa release.
Quddus Chong [Mon, 19 May 2014 20:51:39 +0000 (20:51 +0000)]
Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
Mark Renouf [Mon, 19 May 2014 20:40:51 +0000 (20:40 +0000)]
am
6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
* commit '
6a7843c972122bd90819fe991cb463088f19be0a':
Override windowContentOverlay and windowBackground for Theme.Micro.*
Mark Renouf [Mon, 19 May 2014 20:36:40 +0000 (20:36 +0000)]
Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
Chris Craik [Mon, 19 May 2014 19:32:38 +0000 (19:32 +0000)]
am
00fabcbe: am
b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '
00fabcbeb035fb513293ea01d245002f40b3234f':
Use alpha channel instead of red in drawCachedGlyphBitmap
Chris Craik [Mon, 19 May 2014 19:27:52 +0000 (19:27 +0000)]
am
b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '
b1708e9b764268a06d91219a5c39ee9efd32ab00':
Use alpha channel instead of red in drawCachedGlyphBitmap
Chris Craik [Mon, 19 May 2014 19:23:07 +0000 (19:23 +0000)]
Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
Mark Renouf [Mon, 19 May 2014 17:40:17 +0000 (13:40 -0400)]
Override windowContentOverlay and windowBackground for Theme.Micro.*
Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
Michael Wright [Mon, 19 May 2014 18:23:50 +0000 (18:23 +0000)]
am
7099995b: am
a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit '
7099995be5bfadcb03973d4ae952fd345bae264b':
Extend support for nordic languages with Sami
Michael Wright [Mon, 19 May 2014 18:19:20 +0000 (18:19 +0000)]
am
a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit '
a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
Extend support for nordic languages with Sami
Michael Wright [Mon, 19 May 2014 18:15:38 +0000 (18:15 +0000)]
Merge "Extend support for nordic languages with Sami"
Dirk Dougherty [Mon, 19 May 2014 18:12:40 +0000 (18:12 +0000)]
am
94fb0454: am
4d37d7ef: am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
94fb04547ca35c09409cfc6e3b930805acddc7d6':
Remove neg margin in wear css to resolve layout issue.
Scott Rowe [Mon, 19 May 2014 18:12:37 +0000 (18:12 +0000)]
am
3d55247a: am
a0144782: am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
3d55247a3f8e488b13f7f467cbc70ac4864d2dd2':
docs: b/
14510382 ISO language code, add link
Dirk Dougherty [Mon, 19 May 2014 18:08:53 +0000 (18:08 +0000)]
am
4d37d7ef: am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
4d37d7ef141beaf8f7d1b2bf1c19e3fb8c84203f':
Remove neg margin in wear css to resolve layout issue.
Scott Rowe [Mon, 19 May 2014 18:08:45 +0000 (18:08 +0000)]
am
a0144782: am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
docs: b/
14510382 ISO language code, add link
Robert Ly [Mon, 19 May 2014 17:59:48 +0000 (17:59 +0000)]
am
e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev
* commit '
e5c9d8551b22c1708723b89e8e8d6f830168f292':
docs: updates for changes to notification APIs
Robert Ly [Mon, 19 May 2014 17:56:18 +0000 (17:56 +0000)]
Merge "docs: updates for changes to notification APIs" into klp-modular-dev
Dirk Dougherty [Mon, 19 May 2014 17:27:41 +0000 (17:27 +0000)]
am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
c385b1e4be928133930d9264a92c98f4747adedb':
Remove neg margin in wear css to resolve layout issue.
Dirk Dougherty [Mon, 19 May 2014 17:23:33 +0000 (17:23 +0000)]
Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
Scott Rowe [Mon, 19 May 2014 17:04:53 +0000 (17:04 +0000)]
am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
6d05170a55ac6a9401e6089ba49d675857c3c25d':
docs: b/
14510382 ISO language code, add link
Narayan Kamath [Mon, 19 May 2014 13:33:19 +0000 (13:33 +0000)]
am
deda5467: am
a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit '
deda5467f44fc4a03c3435f0c6d7bda4ea298b99':
Fail if we're unable to agree on an ISA for shared UIDs.
Narayan Kamath [Mon, 19 May 2014 13:29:57 +0000 (13:29 +0000)]
am
a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit '
a4fd1baac68dcd73957e0fca0c02089ecf9a268a':
Fail if we're unable to agree on an ISA for shared UIDs.
Narayan Kamath [Mon, 19 May 2014 13:26:44 +0000 (13:26 +0000)]
Merge "Fail if we're unable to agree on an ISA for shared UIDs."
Narayan Kamath [Thu, 15 May 2014 14:01:46 +0000 (15:01 +0100)]
Fail if we're unable to agree on an ISA for shared UIDs.
It's not worth the complexity of rescanning the APK and
extracting a shared library with a different ABI.
Also gets rid of an unnecessary command line argument and
checks for dex-opt failures while adjusting shared ABIs.
bug:
14453227
Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
Ben Murdoch [Mon, 19 May 2014 11:30:41 +0000 (11:30 +0000)]
am
3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev
* commit '
3011fc1aa7dbffd3faab7d41203f63d2c0b50c2c':
Fallback to NullWebView when Chromium WebView not present.
Ben Murdoch [Mon, 19 May 2014 11:26:31 +0000 (11:26 +0000)]
Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev
Mathieu Meisser [Tue, 17 Dec 2013 15:54:32 +0000 (16:54 +0100)]
Extend support for nordic languages with Sami
Add access (via ralt combination) of Sami characters
into Danish, Norwegian and Swedish mappings.
Update Finnish mapping by fixing wrong Sami characters,
removing wrong ralt+shift mappings and adding support
with capslock+ralt for capital Sami's.
Remove unnecessary swap of MINUS and SLASH key
mapping in kcm.
Change-Id: I872ae2ad31272e8cf55ae1db01c7e30c6a40d5bc
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
Robert Ly [Sun, 11 May 2014 18:25:35 +0000 (11:25 -0700)]
docs: updates for changes to notification APIs
Change-Id: I8a016b0693e928eb864065bea1079be824987340
Joe LaPenna [Sat, 17 May 2014 01:57:44 +0000 (01:57 +0000)]
am
45734b4a: Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
* commit '
45734b4ae180ea3c34f92575b3ed362bbf4f20e5':
Log accept and close debug statements in BluetoothSocket.
Joe LaPenna [Sat, 17 May 2014 01:55:06 +0000 (01:55 +0000)]
Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
Michael Wright [Sat, 17 May 2014 01:09:43 +0000 (01:09 +0000)]
am
3a123fda: am
0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping"
* commit '
3a123fda8a48519601b8782845dfb176de16d871':
Add support for Latvian (qwerty) keyboard mapping
Michael Wright [Sat, 17 May 2014 01:06:51 +0000 (01:06 +0000)]
am
0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping"
* commit '
0a5236a7cd3fa5a62a97f14a512dbeb5eb34772a':
Add support for Latvian (qwerty) keyboard mapping
Michael Wright [Sat, 17 May 2014 01:02:54 +0000 (01:02 +0000)]
Merge "Add support for Latvian (qwerty) keyboard mapping"
Scott Rowe [Fri, 16 May 2014 21:31:46 +0000 (14:31 -0700)]
docs: b/
14510382 ISO language code, add link
Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
Quddus Chong [Wed, 7 May 2014 00:02:49 +0000 (17:02 -0700)]
docs: Updated Javadoc for GMS Kenafa release.
Change-Id: Id3b7853282e317c85d58a7d84657e59a0159961d
Griff Hazen [Fri, 16 May 2014 16:56:47 +0000 (16:56 +0000)]
am
50c11659: Fix Notification sdk docs build.
* commit '
50c11659f0f971e1a6b0adde59247f5de370b74d':
Fix Notification sdk docs build.
Griff Hazen [Fri, 16 May 2014 16:46:31 +0000 (09:46 -0700)]
Fix Notification sdk docs build.
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.
Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
John Reck [Fri, 16 May 2014 16:00:09 +0000 (16:00 +0000)]
am
f18aed83: am
0661ddee: Merge "Enable display list updates with zero delta time"
* commit '
f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
Enable display list updates with zero delta time
John Reck [Fri, 16 May 2014 15:56:07 +0000 (15:56 +0000)]
am
0661ddee: Merge "Enable display list updates with zero delta time"
* commit '
0661ddee112477db180d65e605f34fd538fdf8bc':
Enable display list updates with zero delta time
John Reck [Fri, 16 May 2014 15:51:38 +0000 (15:51 +0000)]
Merge "Enable display list updates with zero delta time"
Griff Hazen [Fri, 16 May 2014 15:40:18 +0000 (15:40 +0000)]
am
959591e3: Add support for extendable actions to Notification.
* commit '
959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
Add support for extendable actions to Notification.
Ben Murdoch [Fri, 16 May 2014 12:41:12 +0000 (13:41 +0100)]
Fallback to NullWebView when Chromium WebView not present.
If it's not possible to load the Chromium WebView, fallback to loading
the NullWebView that will throw UnsupportedOperationException.
Bug:
13438487
Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
Narayan Kamath [Fri, 16 May 2014 12:29:59 +0000 (12:29 +0000)]
am
49538def: am
79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '
49538def98520eb57d4fb634bf09b2f3104e7953':
Init the static member when first used for CursorWindow.
Narayan Kamath [Fri, 16 May 2014 12:26:34 +0000 (12:26 +0000)]
am
79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '
79e0206ef3203a1842949242e58fa8f3c25eb129':
Init the static member when first used for CursorWindow.
Narayan Kamath [Fri, 16 May 2014 12:24:32 +0000 (12:24 +0000)]
Merge "Init the static member when first used for CursorWindow."
Narayan Kamath [Fri, 16 May 2014 12:13:49 +0000 (12:13 +0000)]
am
2c125876: am
8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
2c125876208c6b7173ef561316843d64ae1599e2':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:08:09 +0000 (12:08 +0000)]
am
8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:06:09 +0000 (12:06 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from commit
bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
Griff Hazen [Fri, 16 May 2014 05:26:18 +0000 (22:26 -0700)]
Add support for extendable actions to Notification.
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
Justin Koh [Thu, 15 May 2014 17:20:23 +0000 (17:20 +0000)]
am
0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
* commit '
0ade263c28ea62e619972752ef2e6a6c994eeddf':
If there is only 1 simple global action, autolaunch it
Justin Koh [Thu, 15 May 2014 17:17:13 +0000 (17:17 +0000)]
Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
Baligh Uddin [Thu, 15 May 2014 14:31:13 +0000 (14:31 +0000)]
am
bd44640c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
bd44640c7f532cdfe2b6d8c3e721abd92fbca65e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 May 2014 14:26:05 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Thu, 15 May 2014 13:41:12 +0000 (13:41 +0000)]
am
be3dc575: am
402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '
be3dc5754fd081f54a86df9894763c0da915eed3':
Wait for secondary zygote before bringing up the system_server.
Narayan Kamath [Thu, 15 May 2014 13:38:17 +0000 (13:38 +0000)]
am
402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '
402120a2236b294dff9a51461cb22400a6ef67f6':
Wait for secondary zygote before bringing up the system_server.
Narayan Kamath [Thu, 15 May 2014 13:34:09 +0000 (13:34 +0000)]
Merge "Wait for secondary zygote before bringing up the system_server."
Narayan Kamath [Thu, 15 May 2014 12:45:27 +0000 (12:45 +0000)]
am
6e2e6868: am
706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '
6e2e686889037711170ee145f9dfdb442cee85db':
Remove "required" prefix from ABI fields.
Narayan Kamath [Thu, 15 May 2014 12:41:47 +0000 (12:41 +0000)]
am
706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '
706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
Remove "required" prefix from ABI fields.
Narayan Kamath [Thu, 15 May 2014 12:39:34 +0000 (12:39 +0000)]
Merge "Remove "required" prefix from ABI fields."
Narayan Kamath [Wed, 30 Apr 2014 13:38:46 +0000 (14:38 +0100)]
Remove "required" prefix from ABI fields.
As per a comment on an earlier code review.
(cherry-picked from commit
a9d64733421d6765eab5c2730fa912f068e26047)
Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
Narayan Kamath [Thu, 15 May 2014 09:45:33 +0000 (09:45 +0000)]
am
eabc93db: am
c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit '
eabc93db1020be4b71f0db7d5b5d3a7991f3c264':
app_process: change app_process a symlink of primary version
Narayan Kamath [Thu, 15 May 2014 09:41:40 +0000 (09:41 +0000)]
am
c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit '
c4c08803a8cc090aa27720e97df342231e8433af':
app_process: change app_process a symlink of primary version
Narayan Kamath [Thu, 15 May 2014 09:36:27 +0000 (09:36 +0000)]
Merge "app_process: change app_process a symlink of primary version"
Digish Pandya [Mon, 12 May 2014 09:07:04 +0000 (14:37 +0530)]
Use alpha channel instead of red in drawCachedGlyphBitmap
the correct value to copy in bitmap is alpha component from
the cachebuffer. currently it is offset to red channel if format is
RGBA which is wrong.
this is followup fix for https://android-review.googlesource.com/#/c/93943/
Change-Id: I96b5ba35df5ccaef44caf2542d35d6585ba1df80
Signed-off-by: Digish Pandya <digishp@codeaurora.org>
Dirk Dougherty [Thu, 15 May 2014 03:06:31 +0000 (20:06 -0700)]
Remove neg margin in wear css to resolve layout issue.
Change-Id: I68cc26e55b8bf486a20ec9fa1de48e9caf505165
Tina Zhang [Tue, 13 May 2014 08:30:54 +0000 (16:30 +0800)]
Enable display list updates with zero delta time
It's better not to cancel display lists updates. In the emulator, if we use
low precision clock source like refined-jiffies, the display list which
should be updated with a new frame, won't be updated due to the delta time
is 0 . And this makes all the hardware accelerated GUI out of order.
Change-Id: I41dba8965c96b6ad1b6d326ad1d6fa4a0a49173f
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Ricardo Cervera [Wed, 14 May 2014 23:57:12 +0000 (23:57 +0000)]
am
7c05fd85: am
59ab011e: am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
7c05fd850bfbbbe9139a958102494260b5e6dea2':
docs: Removed outdated troubleshooting guidelines for Android Studio
Mathieu Chartier [Wed, 14 May 2014 23:56:13 +0000 (23:56 +0000)]
am
c0f18b9d: am
c4c77d63: Merge "Add property for background GC type"
* commit '
c0f18b9d0cce0c140b1274055faabff732f1e27c':
Add property for background GC type
Ian Rogers [Wed, 14 May 2014 23:56:06 +0000 (23:56 +0000)]
am
d05c7d26: am
bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
* commit '
d05c7d265170ca6573bbdd97f3c4aaa8e25a6389':
Move FLATTENED_PATTERN to inner class.
Ricardo Cervera [Wed, 14 May 2014 23:53:20 +0000 (23:53 +0000)]
am
59ab011e: am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
docs: Removed outdated troubleshooting guidelines for Android Studio
Mathieu Chartier [Wed, 14 May 2014 23:52:02 +0000 (23:52 +0000)]
am
c4c77d63: Merge "Add property for background GC type"
* commit '
c4c77d63d889baca2abbdce6326077f0911b279e':
Add property for background GC type
Ian Rogers [Wed, 14 May 2014 23:51:59 +0000 (23:51 +0000)]
am
bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
* commit '
bcf76242134317a2f722eab5af2600fe2858f895':
Move FLATTENED_PATTERN to inner class.
Ricardo Cervera [Wed, 14 May 2014 23:49:24 +0000 (23:49 +0000)]
am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
docs: Removed outdated troubleshooting guidelines for Android Studio
Mathieu Chartier [Wed, 14 May 2014 23:07:39 +0000 (23:07 +0000)]
Merge "Add property for background GC type"
Mathieu Chartier [Wed, 14 May 2014 22:44:49 +0000 (15:44 -0700)]
Add property for background GC type
To disable background compaction do:
adb shell setprop dalvik.vm.backgroundgctype CMS
To enable:
adb shell setprop dalvik.vm.backgroundgctype SS
Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
Ricardo Cervera [Wed, 14 May 2014 22:44:56 +0000 (22:44 +0000)]
Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
Ian Rogers [Wed, 14 May 2014 22:40:58 +0000 (22:40 +0000)]
Merge "Move FLATTENED_PATTERN to inner class."
Ian Rogers [Wed, 14 May 2014 22:29:35 +0000 (15:29 -0700)]
Move FLATTENED_PATTERN to inner class.
Avoid AOT compilation/initialization in ART failing due to regex.Pattern
requiring native support.
Bug:
14646037
Change-Id: I9d9c7fd9ed9fab7e21d37f9b31c00d037fc5a691
Dirk Dougherty [Wed, 14 May 2014 21:24:29 +0000 (21:24 +0000)]
am
0f582284: am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
0f5822847ae3422d939a7959f6a25178fcc12232':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:24:24 +0000 (21:24 +0000)]
am
0540bc37: am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
0540bc373c84b4ab590708cc9f79c95eeac5114c':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:21:23 +0000 (21:21 +0000)]
am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:21:15 +0000 (21:21 +0000)]
am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:17:27 +0000 (21:17 +0000)]
am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:17:22 +0000 (21:17 +0000)]
am
3506ac87: Doc change: Updated content for distribute.
* commit '
3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:16:31 +0000 (21:16 +0000)]
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
Dirk Dougherty [Fri, 21 Feb 2014 19:15:52 +0000 (11:15 -0800)]
Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
Yongqin Liu [Tue, 6 May 2014 15:30:40 +0000 (23:30 +0800)]
app_process: change app_process a symlink of primary version
Change app_process to be a symlink to the primary version
and have app_process32/app_process64 be the 32-bit/64-bit
versions respectively.
This will make it possible to use the primary zygote for
am/pm commands and other scripts that use app_process and
don't need a specific zygote.
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibef545994eb95ddc82101c95df613ad1d06345e6
Baligh Uddin [Wed, 14 May 2014 17:44:46 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e
Auto-generated-cl: translation import
Justin Koh [Mon, 12 May 2014 23:00:36 +0000 (16:00 -0700)]
If there is only 1 simple global action, autolaunch it
Requested by UX. Also made settings available before provisioning
Bug:
14683740
Bug:
14886954
Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
Torne (Richard Coles) [Wed, 14 May 2014 15:35:19 +0000 (15:35 +0000)]
am
dcc9cf03: am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
Avoid supported ABI list containing "unknown".
Torne (Richard Coles) [Wed, 14 May 2014 15:31:28 +0000 (15:31 +0000)]
am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
41ec8c9672fccce90a7156bcd856f59a36e93ad3':
Avoid supported ABI list containing "unknown".
Torne (Richard Coles) [Wed, 14 May 2014 15:26:04 +0000 (15:26 +0000)]
Merge "Avoid supported ABI list containing "unknown"."
Torne (Richard Coles) [Wed, 14 May 2014 15:17:26 +0000 (16:17 +0100)]
Avoid supported ABI list containing "unknown".
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.
Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
Joe LaPenna [Wed, 14 May 2014 01:17:46 +0000 (18:17 -0700)]
Log accept and close debug statements in BluetoothSocket.
Bug:
14902781
Bug:
14784262
Change-Id: Id0c2cd216244e05c218568427bda863a538b1041
Deepanshu Gupta [Wed, 14 May 2014 00:36:23 +0000 (00:36 +0000)]
am
80816bfc: am
f73dbcc3: am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
80816bfcaf487535a45a7e6f271341eaede653b1':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:36:20 +0000 (00:36 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:31:20 +0000 (00:31 +0000)]
am
f73dbcc3: am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8':
Fix build due to incorrect merges [DO NOT MERGE]
OSDN Git Service
