OSDN Git Service
Matthew Williams [Thu, 14 Nov 2013 17:32:02 +0000 (09:32 -0800)]
am
72402f9d: am
09d8e3cf: am
c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit '
72402f9de7b108d77316e3c93399b07a2f98c42a':
SyncManager now returns copy on getCurrentSyncs()
Matthew Williams [Thu, 14 Nov 2013 17:27:26 +0000 (09:27 -0800)]
am
09d8e3cf: am
c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit '
09d8e3cf4e411b016ee65d8328dd7a443c9de0ff':
SyncManager now returns copy on getCurrentSyncs()
Matthew Williams [Thu, 14 Nov 2013 17:23:32 +0000 (09:23 -0800)]
am
c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit '
c68bb18244aa12d19bea9f9d59f2fe0d81478904':
SyncManager now returns copy on getCurrentSyncs()
Matthew Williams [Thu, 14 Nov 2013 17:18:58 +0000 (17:18 +0000)]
Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
Scott Main [Thu, 14 Nov 2013 07:42:10 +0000 (23:42 -0800)]
am
d1b0af82: am
3f6d9630: am
34aab81a: Merge "add information about required meta-data for gcore bug:
11553131" into klp-docs
* commit '
d1b0af82855528c531a35d28d3c65d7a94f2228c':
add information about required meta-data for gcore bug:
11553131
Scott Main [Thu, 14 Nov 2013 07:38:02 +0000 (23:38 -0800)]
am
3f6d9630: am
34aab81a: Merge "add information about required meta-data for gcore bug:
11553131" into klp-docs
* commit '
3f6d9630e8a8d7b5b3040d510885e10fca6e4efc':
add information about required meta-data for gcore bug:
11553131
Scott Main [Thu, 14 Nov 2013 07:32:22 +0000 (07:32 +0000)]
am
34aab81a: Merge "add information about required meta-data for gcore bug:
11553131" into klp-docs
* commit '
34aab81a255545a029dc436bd63dd275a6ef3aa5':
add information about required meta-data for gcore bug:
11553131
Scott Main [Thu, 14 Nov 2013 07:28:57 +0000 (07:28 +0000)]
Merge "add information about required meta-data for gcore bug:
11553131" into klp-docs
Satoshi Kataoka [Thu, 14 Nov 2013 06:32:43 +0000 (22:32 -0800)]
am
b97e102c: am
1b570b57: am
5fd5aa3d: Fix compatibility issue on InputMethodSubtype
* commit '
b97e102c4b9041ea8c5bb753743f2e1d7d3cf06a':
Fix compatibility issue on InputMethodSubtype
Satoshi Kataoka [Thu, 14 Nov 2013 06:28:47 +0000 (22:28 -0800)]
am
1b570b57: am
5fd5aa3d: Fix compatibility issue on InputMethodSubtype
* commit '
1b570b571a63311f7f7d5b7cc5e17b3103fa8af9':
Fix compatibility issue on InputMethodSubtype
Satoshi Kataoka [Thu, 14 Nov 2013 06:25:01 +0000 (22:25 -0800)]
am
5fd5aa3d: Fix compatibility issue on InputMethodSubtype
* commit '
5fd5aa3d066fc12c92b5b6541d85ac243556223f':
Fix compatibility issue on InputMethodSubtype
Jean Chalard [Thu, 14 Nov 2013 06:18:29 +0000 (22:18 -0800)]
am
86a35ab4: (-s ours) am
94be0049: am
4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs
* commit '
86a35ab4e757e266f613a2e431e16977514600a7':
[DO NOT MERGE] Improve documentation for InputType and EditorInfo.
Adam Powell [Thu, 14 Nov 2013 06:18:10 +0000 (22:18 -0800)]
am
73a4aeb9: am
75ae8983: am
48d2bcf2: Reset padding flags when set programmatically or implicitly from background
* commit '
73a4aeb9ffa15a2c08edf3ba69157c08821930ee':
Reset padding flags when set programmatically or implicitly from background
Jean Chalard [Thu, 14 Nov 2013 06:11:48 +0000 (22:11 -0800)]
am
94be0049: am
4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs
* commit '
94be004960d5cabacb5da4a98e08b02d174b0ba7':
[DO NOT MERGE] Improve documentation for InputType and EditorInfo.
Satoshi Kataoka [Thu, 14 Nov 2013 03:04:51 +0000 (12:04 +0900)]
Fix compatibility issue on InputMethodSubtype
Bug:
11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
Jean Chalard [Thu, 14 Nov 2013 06:08:28 +0000 (06:08 +0000)]
am
4863e686: Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs
* commit '
4863e686d8db10537a1131732672da5203245788':
[DO NOT MERGE] Improve documentation for InputType and EditorInfo.
Jean Chalard [Thu, 14 Nov 2013 06:04:13 +0000 (06:04 +0000)]
Merge "[DO NOT MERGE] Improve documentation for InputType and EditorInfo." into klp-docs
Scott Main [Thu, 14 Nov 2013 05:23:20 +0000 (21:23 -0800)]
add information about required meta-data for gcore
bug:
11553131
Change-Id: Ie3890c7894a017fc28e4a094a0e1ec3ac9f8c043
Adam Powell [Thu, 14 Nov 2013 03:45:21 +0000 (19:45 -0800)]
am
75ae8983: am
48d2bcf2: Reset padding flags when set programmatically or implicitly from background
* commit '
75ae89837615fa9cebd6cbb051213c025c48bcf6':
Reset padding flags when set programmatically or implicitly from background
Adam Powell [Thu, 14 Nov 2013 03:41:07 +0000 (19:41 -0800)]
am
48d2bcf2: Reset padding flags when set programmatically or implicitly from background
* commit '
48d2bcf2ce2305356c5a4f0dfbb928dc5a4c8331':
Reset padding flags when set programmatically or implicitly from background
Adam Powell [Thu, 14 Nov 2013 02:54:33 +0000 (18:54 -0800)]
Reset padding flags when set programmatically or implicitly from background
Bug
11673480
Change-Id: I4f33c7ae46e937302e625bf1f3260adb25843645
Jim Miller [Thu, 14 Nov 2013 02:48:43 +0000 (18:48 -0800)]
am
71fb32e0: am
5305fe3f: am
39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
* commit '
71fb32e0801ee9b4d0ed1c9063afbdf17635b30e':
Don't set up external displays from binder thread
Svetoslav [Thu, 14 Nov 2013 02:48:40 +0000 (18:48 -0800)]
am
5880b363: am
fe666e84: am
4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev
* commit '
5880b363a6b7fd417b6a8f0802f144fb38c82117':
Avoid NPE and add a warning log if a printing app misbehaves.
Jim Miller [Thu, 14 Nov 2013 02:48:36 +0000 (18:48 -0800)]
am
fdf7c36d: am
378c804d: am
c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
* commit '
fdf7c36daaeec8c6ad7872f81e1f9c3faf1a0e91':
Report keyguard as initially showing and secure until we know
Robert Greenwalt [Thu, 14 Nov 2013 02:48:31 +0000 (18:48 -0800)]
am
d4257e8f: resolved conflicts for merge of
ec9e8933 to klp-dev-plus-aosp
* commit '
d4257e8f469eacc1ba8142b0b1bc4ca0327a7a0e':
Fix for the invalid Global Proxy Setting
Glenn Kasten [Thu, 14 Nov 2013 02:48:20 +0000 (18:48 -0800)]
am
c5f317e4: am
1b21665b: am
c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev
* commit '
c5f317e48e0406a0303eb1303cee4c5da2c6272d':
Replace keyboard sounds with latest (softer) design
Vinit Deshapnde [Thu, 14 Nov 2013 02:48:13 +0000 (18:48 -0800)]
am
9dbaaab8: am
daf21d76: am
75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev
* commit '
9dbaaab85eb4557b40086e6b37882af7b03725ba':
Increase Reject threshold for disabling networks
Lajos Molnar [Thu, 14 Nov 2013 02:48:09 +0000 (18:48 -0800)]
am
752926c7: am
1197bc37: am
7e11b16b: VideoView: expand documentation on state save/restore limitations
* commit '
752926c752b9516c05a36f3eed6ab6b77d32b2c6':
VideoView: expand documentation on state save/restore limitations
Robert Greenwalt [Thu, 14 Nov 2013 02:47:57 +0000 (18:47 -0800)]
am
7fdfe28c: am
4c514f2a: am
594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '
7fdfe28c75e103b8a66b559dcb813576fbbf2eb5':
Fix for the invalid Global Proxy Setting
Craig Mautner [Thu, 14 Nov 2013 02:47:54 +0000 (18:47 -0800)]
am
1fbb5da2: am
29bbd570: am
1f0f9fa9: Merge "Add null pointer check." into klp-dev
* commit '
1fbb5da29a4ebef1d758dffad9c2704a5932d223':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Add null pointer check.
Import translations. DO NOT MERGE
Small DocumentsProvider doc improvements.
Keyguard isn't visible if it hasn't been drawn.
Enable fast camera transition when launched from navbar
Reduce camera launch time by about 250ms.
camera2: Remove prior repeating request when setting.
Svetoslav [Thu, 14 Nov 2013 02:43:32 +0000 (18:43 -0800)]
resolved conflicts for merge of
9358d98d to master
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3
Matthew Williams [Tue, 12 Nov 2013 22:41:02 +0000 (14:41 -0800)]
SyncManager now returns copy on getCurrentSyncs()
Bug:
11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.
Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
Jim Miller [Thu, 14 Nov 2013 01:54:11 +0000 (17:54 -0800)]
am
5305fe3f: am
39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
* commit '
5305fe3f0971274d90d875cfbeffdb18e3b03f09':
Don't set up external displays from binder thread
Svetoslav [Thu, 14 Nov 2013 01:54:08 +0000 (17:54 -0800)]
am
fe666e84: am
4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev
* commit '
fe666e848a1672a414bad93c105fa876f6c9f4de':
Avoid NPE and add a warning log if a printing app misbehaves.
Jim Miller [Thu, 14 Nov 2013 01:54:04 +0000 (17:54 -0800)]
am
378c804d: am
c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
* commit '
378c804d652f32547d3fe460842e5720b57bd9f1':
Report keyguard as initially showing and secure until we know
Robert Greenwalt [Thu, 14 Nov 2013 01:50:35 +0000 (17:50 -0800)]
resolved conflicts for merge of
ec9e8933 to klp-dev-plus-aosp
Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd
Jim Miller [Thu, 14 Nov 2013 01:50:26 +0000 (17:50 -0800)]
am
39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
* commit '
39af5a78c073d01539625a9fbbb8511747e2f048':
Don't set up external displays from binder thread
Svetoslav [Thu, 14 Nov 2013 01:50:22 +0000 (17:50 -0800)]
am
4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev
* commit '
4e04115052a66d5a7836c5e7a9bfc1a5d6f3784b':
Avoid NPE and add a warning log if a printing app misbehaves.
Jim Miller [Thu, 14 Nov 2013 01:50:18 +0000 (17:50 -0800)]
am
c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
* commit '
c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d':
Report keyguard as initially showing and secure until we know
Jim Miller [Thu, 14 Nov 2013 01:47:32 +0000 (01:47 +0000)]
Merge "Don't set up external displays from binder thread" into klp-dev
Svetoslav [Thu, 14 Nov 2013 01:46:47 +0000 (01:46 +0000)]
Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev
Jim Miller [Thu, 14 Nov 2013 01:45:51 +0000 (01:45 +0000)]
Merge "Report keyguard as initially showing and secure until we know" into klp-dev
Svetoslav [Thu, 14 Nov 2013 01:31:11 +0000 (17:31 -0800)]
Avoid NPE and add a warning log if a printing app misbehaves.
An app can print only from an activity. If the activity is finished
before printing completes we destroy the PrintDocumentAdapter. The
app may however invoke some of the print callbacks after destruction
resulting in a NPE. This change checks if the adapter is destroyed
and if so does not crash while printing a meaningful log error with
the mistake of the app developer.
bug:
11675274
Change-Id: I66539cfbd7583f52cb863a84ef8e40856f92ceed
Glenn Kasten [Thu, 14 Nov 2013 01:16:09 +0000 (17:16 -0800)]
am
1b21665b: am
c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev
* commit '
1b21665bf6a1049809185e878e0e29ed3f29d197':
Replace keyboard sounds with latest (softer) design
Glenn Kasten [Thu, 14 Nov 2013 01:12:13 +0000 (17:12 -0800)]
am
c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev
* commit '
c32d89f63f5eb8b764e88dbe4c0bcefab330cfb2':
Replace keyboard sounds with latest (softer) design
Glenn Kasten [Thu, 14 Nov 2013 01:09:51 +0000 (01:09 +0000)]
Merge "Replace keyboard sounds with latest (softer) design" into klp-dev
Jim Miller [Thu, 14 Nov 2013 00:44:39 +0000 (16:44 -0800)]
Don't set up external displays from binder thread
This fixes a bug where keyguard was attempting to set up
external presentation displays from the binder thread instead
of the UI thread. Bad dog.
Fixes bug
11676486
Change-Id: Iadbe485691acc56a41b23219fe399f7eda40cb7c
Vinit Deshapnde [Thu, 14 Nov 2013 00:44:59 +0000 (16:44 -0800)]
am
daf21d76: am
75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev
* commit '
daf21d76d2d4316a08531a0598d303ae427c7467':
Increase Reject threshold for disabling networks
Lajos Molnar [Thu, 14 Nov 2013 00:44:55 +0000 (16:44 -0800)]
am
1197bc37: am
7e11b16b: VideoView: expand documentation on state save/restore limitations
* commit '
1197bc37e58fe7cd5ab32278367e53f19f01f784':
VideoView: expand documentation on state save/restore limitations
Vinit Deshapnde [Thu, 14 Nov 2013 00:40:29 +0000 (16:40 -0800)]
am
75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev
* commit '
75c12de0cd35b8f969d64fc44eb172e283063538':
Increase Reject threshold for disabling networks
Lajos Molnar [Thu, 14 Nov 2013 00:40:26 +0000 (16:40 -0800)]
am
7e11b16b: VideoView: expand documentation on state save/restore limitations
* commit '
7e11b16b9f8896170d492240a5fd50c8bd04105d':
VideoView: expand documentation on state save/restore limitations
Vinit Deshapnde [Thu, 14 Nov 2013 00:36:54 +0000 (00:36 +0000)]
Merge "Increase Reject threshold for disabling networks" into klp-dev
Robert Greenwalt [Thu, 14 Nov 2013 00:29:12 +0000 (16:29 -0800)]
am
4c514f2a: am
594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '
4c514f2a688bdae319c919987092ccfee690f390':
Fix for the invalid Global Proxy Setting
Robert Greenwalt [Thu, 14 Nov 2013 00:27:56 +0000 (16:27 -0800)]
am
3b9244b4: Merge "Fix for the invalid Global Proxy Setting"
* commit '
3b9244b4b4d5008daa9763a169a751975c75cc54':
Fix for the invalid Global Proxy Setting
Lajos Molnar [Wed, 30 Oct 2013 21:04:10 +0000 (14:04 -0700)]
VideoView: expand documentation on state save/restore limitations
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11412889
Robert Greenwalt [Thu, 14 Nov 2013 00:26:45 +0000 (16:26 -0800)]
am
594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '
594eeb082e548617ff5092496888c43457593c2b':
Fix for the invalid Global Proxy Setting
Craig Mautner [Thu, 14 Nov 2013 00:23:38 +0000 (16:23 -0800)]
am
29bbd570: am
1f0f9fa9: Merge "Add null pointer check." into klp-dev
* commit '
29bbd570fe36c55321a3cd9d84330dea9d2f1e10':
Add null pointer check.
Robert Greenwalt [Thu, 14 Nov 2013 00:23:04 +0000 (00:23 +0000)]
Merge "Fix for the invalid Global Proxy Setting"
Robert Greenwalt [Thu, 14 Nov 2013 00:22:46 +0000 (00:22 +0000)]
Merge "Fix for the invalid Global Proxy Setting" into klp-dev
Craig Mautner [Thu, 14 Nov 2013 00:20:02 +0000 (16:20 -0800)]
am
1f0f9fa9: Merge "Add null pointer check." into klp-dev
* commit '
1f0f9fa94913198cd79b8d350cf9e8df8001daeb':
Add null pointer check.
Craig Mautner [Thu, 14 Nov 2013 00:15:55 +0000 (00:15 +0000)]
Merge "Add null pointer check." into klp-dev
Raj Mamadgi [Mon, 11 Nov 2013 21:52:58 +0000 (13:52 -0800)]
Fix for the invalid Global Proxy Setting
Adding validation for Global Proxy setting before it is
being set.
Proxy is validated at the boot time also to make sure
the value set is valid.
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:
11598568
Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
Vinit Deshapnde [Wed, 13 Nov 2013 23:48:11 +0000 (15:48 -0800)]
Increase Reject threshold for disabling networks
This change modifies a framework optimization. The framework optimization
disables a network when an access point repeatedly rejects requests
to associate with it. This change has some problems; one being that
it counts the rejects for all networks, and not for a specific network.
This incorrectly penalizes last networks at times; and since the current
threshold is 4 rejects, the probability of penalizing wrong networks
is high. This change ups that number to 16 to reduce that probability.
Bug:
11654725
Change-Id: I7150a9ccbb54bac44f2c2ba100fb6617ded33616
Jim Miller [Wed, 13 Nov 2013 23:40:48 +0000 (15:40 -0800)]
Report keyguard as initially showing and secure until we know
This fixes a bug where an app calls KeyguardManager.isLocked()
before keyguard has had a chance to show. The fix is to assume
keyguard is showing and secure until we know otherwise.
Fixes bug
11670159
Change-Id: Ifbe4cdf40e3b76d2069ecace940f85fa58f31187
Elliott Hughes [Wed, 13 Nov 2013 23:26:53 +0000 (15:26 -0800)]
am
84f4ad80: am
87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."
* commit '
84f4ad807152b6266431144425f153c48db28696':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Ed Heyl [Wed, 13 Nov 2013 23:26:25 +0000 (15:26 -0800)]
am
af49ff8c: am
a951fa56: merge in release branch changes (no-op).
* commit '
af49ff8c395262a29cb670c86faa0d78cec46034':
camera2: Remove prior repeating request when setting.
Ed Heyl [Wed, 13 Nov 2013 23:23:23 +0000 (15:23 -0800)]
am
a951fa56: merge in release branch changes (no-op).
* commit '
a951fa56f1855cd0337bddacc01e35868c6d66d6':
camera2: Remove prior repeating request when setting.
Elliott Hughes [Wed, 13 Nov 2013 23:21:51 +0000 (15:21 -0800)]
am
87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."
* commit '
87c5eeb48b1a0c498eae9bd2877fb33678d90b8a':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Ed Heyl [Wed, 13 Nov 2013 23:19:22 +0000 (15:19 -0800)]
merge in release branch changes (no-op).
Craig Mautner [Wed, 13 Nov 2013 23:18:47 +0000 (15:18 -0800)]
am
ef1dd26e: am
0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev
* commit '
ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5':
Keyguard isn't visible if it hasn't been drawn.
Elliott Hughes [Wed, 13 Nov 2013 23:18:00 +0000 (23:18 +0000)]
Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."
Craig Mautner [Wed, 13 Nov 2013 23:14:45 +0000 (15:14 -0800)]
am
0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev
* commit '
0e823a450a729a753fb8e0618474b6ae3cf3b810':
Keyguard isn't visible if it hasn't been drawn.
Craig Mautner [Wed, 13 Nov 2013 23:11:12 +0000 (23:11 +0000)]
Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev
Elliott Hughes [Wed, 13 Nov 2013 23:10:40 +0000 (15:10 -0800)]
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
Craig Mautner [Wed, 13 Nov 2013 23:06:15 +0000 (15:06 -0800)]
Add null pointer check.
Fixes bug
11673948.
Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
Baligh Uddin [Wed, 13 Nov 2013 22:46:17 +0000 (14:46 -0800)]
am
22bc9f43: (-s ours) am
dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
22bc9f4381e4b058124095abf50209c475c02908':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Nov 2013 22:42:44 +0000 (14:42 -0800)]
am
dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
dc0acc6f5d4cc8e4ed6d2a13793030350cd6262d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Nov 2013 22:39:57 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 13 Nov 2013 22:39:40 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jeff Sharkey [Wed, 13 Nov 2013 22:39:25 +0000 (14:39 -0800)]
am
529ba106: am
711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev
* commit '
529ba10693bbb2d756b2ba6af706accdba64692a':
Small DocumentsProvider doc improvements.
Jeff Sharkey [Wed, 13 Nov 2013 22:34:49 +0000 (14:34 -0800)]
am
711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev
* commit '
711d390be96531c5dfadb9a17e373f1e92ef16a1':
Small DocumentsProvider doc improvements.
Jim Miller [Wed, 13 Nov 2013 22:32:35 +0000 (14:32 -0800)]
am
291b7f56: am
3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev
* commit '
291b7f56159a942911c5e83c42b89ecd2440708c':
Enable fast camera transition when launched from navbar
Jeff Sharkey [Wed, 13 Nov 2013 22:31:01 +0000 (22:31 +0000)]
Merge "Small DocumentsProvider doc improvements." into klp-dev
Jim Miller [Wed, 13 Nov 2013 22:28:06 +0000 (14:28 -0800)]
am
3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev
* commit '
3714473f1a077cae6eca3079da67a7dd09dcff65':
Enable fast camera transition when launched from navbar
Jim Miller [Wed, 13 Nov 2013 22:27:58 +0000 (14:27 -0800)]
am
cefe47c0: am
9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
* commit '
cefe47c0d3471aedd4f7d4d3b5137a2a95161ad4':
Reduce camera launch time by about 250ms.
Svetoslav Ganov [Wed, 13 Nov 2013 22:27:54 +0000 (14:27 -0800)]
am
852a8895: am
d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
* commit '
852a8895e18ad578a4c299d13615a4cbb3ee1211':
Fix NPE at PrintSpooler in Japanese environment.
Jim Miller [Wed, 13 Nov 2013 22:24:26 +0000 (14:24 -0800)]
am
9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
* commit '
9c8d56a692198a3fc1629a0407ea6027f04e9a91':
Reduce camera launch time by about 250ms.
Svetoslav Ganov [Wed, 13 Nov 2013 22:24:23 +0000 (14:24 -0800)]
am
d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
* commit '
d697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
Fix NPE at PrintSpooler in Japanese environment.
Jim Miller [Wed, 13 Nov 2013 22:23:34 +0000 (22:23 +0000)]
Merge "Enable fast camera transition when launched from navbar" into klp-dev
Jim Miller [Wed, 13 Nov 2013 22:22:13 +0000 (22:22 +0000)]
Merge "Reduce camera launch time by about 250ms." into klp-dev
Svetoslav Ganov [Wed, 13 Nov 2013 22:19:56 +0000 (22:19 +0000)]
Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 21:43:06 +0000 (13:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8788c70c6920a36c5187ad415e5d17d3b7d525ca
Auto-generated-cl: translation import
Svetoslav [Wed, 13 Nov 2013 21:42:57 +0000 (13:42 -0800)]
am
e84f23b5: am
60020252: am
14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
* commit '
e84f23b5fd72c03ca4c8cbef3bc1fde4eec29f36':
Update the PrintDocumentAdapter docs.
Baligh Uddin [Wed, 13 Nov 2013 21:39:45 +0000 (13:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I11d764583416d7fb4dfc85ebe81a98b6a1267424
Auto-generated-cl: translation import
Svetoslav [Wed, 13 Nov 2013 21:38:21 +0000 (13:38 -0800)]
am
60020252: am
14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
* commit '
60020252db88825b0c0951de7fef6f07d68786a9':
Update the PrintDocumentAdapter docs.
Svetoslav [Wed, 13 Nov 2013 21:34:00 +0000 (13:34 -0800)]
am
14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
* commit '
14f300803b7d16a3c9632cb626529e873e4813f1':
Update the PrintDocumentAdapter docs.
Jeff Sharkey [Wed, 13 Nov 2013 21:31:09 +0000 (13:31 -0800)]
Small DocumentsProvider doc improvements.
Bug:
11670294
Change-Id: I5fb91c7665fc2a4531059ef9f2de0972ebabe1ea
Svetoslav [Wed, 13 Nov 2013 21:30:57 +0000 (21:30 +0000)]
Merge "Update the PrintDocumentAdapter docs." into klp-dev
Dirk Dougherty [Wed, 13 Nov 2013 21:23:12 +0000 (13:23 -0800)]
am
7c85b522: am
026d0684: am
90b7f631: Doc change: fix typo.
* commit '
7c85b522e3c42f762d6b1d2f62130173a165d246':
Doc change: fix typo.
Baligh Uddin [Wed, 13 Nov 2013 21:19:39 +0000 (21:19 +0000)]
Merge "Import translations. DO NOT MERGE"
OSDN Git Service
