OSDN Git Service
Baligh Uddin [Tue, 25 Mar 2014 20:05:02 +0000 (13:05 -0700)]
am
52528c5e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
52528c5ef0ad6407ed360146a4986e7894b75a3d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 20:04:59 +0000 (13:04 -0700)]
am
d894e15c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
d894e15c135575698816a6def7c2c384bd49dae7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 20:04:56 +0000 (13:04 -0700)]
am
fca9992c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
fca9992c4bef92da76a37399d463e3cb3ab69139':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 20:04:53 +0000 (13:04 -0700)]
am
71d718b7: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
71d718b749554c9c0658082c8d650a02c845fec3':
Import translations. DO NOT MERGE
Sailesh Nepal [Tue, 25 Mar 2014 20:02:59 +0000 (13:02 -0700)]
resolved conflicts for merge of
2d72d000 to master-nova
Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d
Baligh Uddin [Tue, 25 Mar 2014 18:56:18 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:33 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:31 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 18:52:29 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Gabriel Peal [Tue, 25 Mar 2014 18:32:22 +0000 (18:32 +0000)]
Merge "resolved conflicts for merge of
74fb97de to master"
Chris Craik [Tue, 25 Mar 2014 18:12:23 +0000 (11:12 -0700)]
am
c21929c7: Merge "Fix doc build"
* commit '
c21929c710949a48790fa2701c47cedfabb7b9dc':
Fix doc build
Chris Craik [Tue, 25 Mar 2014 18:08:30 +0000 (18:08 +0000)]
Merge "Fix doc build"
Gabriel Peal [Fri, 21 Mar 2014 18:31:32 +0000 (11:31 -0700)]
resolved conflicts for merge of
74fb97de to master
Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a
Chris Craik [Tue, 25 Mar 2014 18:06:58 +0000 (11:06 -0700)]
Fix doc build
Change-Id: I18627229be3e8e242e469af83e7e5ae580b03707
Jean-Michel Trivi [Tue, 25 Mar 2014 17:57:08 +0000 (10:57 -0700)]
am
cd60e3a5: Merge "Begin refactor of MediaFocusControl"
* commit '
cd60e3a57cfdc3d00083287c6589a2c7a7d7b104':
Begin refactor of MediaFocusControl
Jean-Michel Trivi [Tue, 25 Mar 2014 17:52:00 +0000 (17:52 +0000)]
Merge "Begin refactor of MediaFocusControl"
John Reck [Tue, 25 Mar 2014 17:51:42 +0000 (10:51 -0700)]
am
bcad68ad: Merge "Move where updateProperties is called"
* commit '
bcad68ad80e5a44e5dc6988eddb8acabdc01a737':
Move where updateProperties is called
Jean-Michel Trivi [Fri, 21 Mar 2014 16:15:43 +0000 (09:15 -0700)]
Begin refactor of MediaFocusControl
Extract class that handles each entry in the remote control stack
and move it to another file, MediaController.java.
Rename RemoteControlStackEntry to MediaController as each instance
will not just encapsulate information about the corresponding
(if any) RemoteControlClient.
This is just a CL for the renaming and extraction into a new file
of existing code. Obvious required changes are labelled "FIXME".
Change-Id: Ifbdac1d70e4d279ab175eef03e9d792d44873c51
John Reck [Tue, 25 Mar 2014 17:46:18 +0000 (17:46 +0000)]
Merge "Move where updateProperties is called"
John Reck [Tue, 25 Mar 2014 17:29:28 +0000 (10:29 -0700)]
am
632717e6: Merge "Add missing null check"
* commit '
632717e60990b900e6d20dddd3935a57dd6a8fa6':
Add missing null check
Tim Kilbourn [Tue, 25 Mar 2014 17:26:09 +0000 (10:26 -0700)]
am
803d91b2: Fix NPE when inflating GradientDrawables.
* commit '
803d91b2b2eef42e1ebe088613f83e555d2bfd04':
Fix NPE when inflating GradientDrawables.
John Reck [Tue, 25 Mar 2014 17:25:33 +0000 (17:25 +0000)]
Merge "Add missing null check"
John Reck [Tue, 25 Mar 2014 17:22:09 +0000 (10:22 -0700)]
Add missing null check
Bug:
13635394
mDisplayListData can be null, make sure
to check for that before trying to walk through the
children list in updateProperties
Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d
Tim Kilbourn [Tue, 25 Mar 2014 17:13:02 +0000 (10:13 -0700)]
Fix NPE when inflating GradientDrawables.
Change-Id: If624d6efac61dabe6009ee4368ad7b119e1d4dcd
Przemyslaw Szczepaniak [Tue, 25 Mar 2014 10:44:21 +0000 (03:44 -0700)]
am
0a8596dc: Merge "Documentation update for TextToSpeech#getFeatures"
* commit '
0a8596dc0c497404a332ae990b2bd77553cde870':
Documentation update for TextToSpeech#getFeatures
Przemyslaw Szczepaniak [Tue, 25 Mar 2014 10:40:18 +0000 (10:40 +0000)]
Merge "Documentation update for TextToSpeech#getFeatures"
Yohann Roussel [Tue, 25 Mar 2014 09:42:47 +0000 (02:42 -0700)]
am
30494b70: Merge "Add one test application for multidex."
* commit '
30494b70e96a45f91231586b5b5be45a4f6dea1a':
Add one test application for multidex.
Yohann Roussel [Tue, 25 Mar 2014 09:38:42 +0000 (09:38 +0000)]
Merge "Add one test application for multidex."
John Reck [Tue, 25 Mar 2014 04:00:18 +0000 (21:00 -0700)]
Move where updateProperties is called
Change-Id: I27da448996019094c44487ce28c5689d098d6535
Alan Viverette [Tue, 25 Mar 2014 02:59:53 +0000 (19:59 -0700)]
am
eebf17ad: Merge "Unhide touch feedback drawable and wrapper"
* commit '
eebf17ad202f712173840e25da356c5bef870ff8':
Unhide touch feedback drawable and wrapper
Alan Viverette [Tue, 25 Mar 2014 02:55:27 +0000 (02:55 +0000)]
Merge "Unhide touch feedback drawable and wrapper"
Alan Viverette [Tue, 25 Mar 2014 02:54:34 +0000 (19:54 -0700)]
Unhide touch feedback drawable and wrapper
Change-Id: I98926d4adfb6e8c6130b31c8f4534a1a382d0f3b
Michael Wright [Tue, 25 Mar 2014 01:53:52 +0000 (18:53 -0700)]
am
5da8ca91: Merge "Respect ACTION_CANCEL for joystick fallbacks"
* commit '
5da8ca918967b7100b8f7927c08075e4555347ab':
Respect ACTION_CANCEL for joystick fallbacks
Michael Wright [Tue, 25 Mar 2014 01:48:06 +0000 (01:48 +0000)]
Merge "Respect ACTION_CANCEL for joystick fallbacks"
Alan Viverette [Tue, 25 Mar 2014 01:30:18 +0000 (18:30 -0700)]
am
9bbbee11: Merge "Implement APIs for obtaining, caching themed Drawables"
* commit '
9bbbee116e5d480c56676686b96e86e2ef7d83ca':
Implement APIs for obtaining, caching themed Drawables
Alan Viverette [Tue, 25 Mar 2014 01:26:15 +0000 (01:26 +0000)]
Merge "Implement APIs for obtaining, caching themed Drawables"
Alan Viverette [Tue, 25 Mar 2014 01:00:26 +0000 (18:00 -0700)]
Implement APIs for obtaining, caching themed Drawables
When Drawables are inflated during preload (or otherwise without a theme)
they cache their themeable attributes in their constant state as an array
keyed on attribute index. Drawables inflated with a theme will simply
resolve theme attributes as part of normal inflation, and they will not
cache any themeable attributes.
Drawables obtained from Resources are pulled from theme-specific cache
when possible. If an unthemed Drawable exists in the preload cache, a
new constant state will be obtained for the Drawable and the theme will
be applied by resolving the cached themeable attributes and overwriting
their respective constant state properties. If no cached version exists,
a new Drawable is inflated against the desired theme.
Constant states from themed drawables may be cached if the applied theme
is "pure" and was loaded from a style resource without any subsequent
modifications.
This CL does not handle applying themes to several Drawable types, but it
fully supports BitmapDrawable, GradientDrawable, NinePatchDrawable,
ColorDrawable, and TouchFeedbackDrawable.
BUG:
12611005
Change-Id: I4e794fbb62f7a371715f4ebdf946ee5f9a5ad1c9
Chong Zhang [Tue, 25 Mar 2014 00:38:14 +0000 (17:38 -0700)]
am
29e4cf0a: am
2ac81ee6: (-s ours) am
c4e6233b: am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
29e4cf0a1a0ece43d524b4dfa340ab98da6e19f5':
DO NOT MERGE change Surface constructor arg to 64bit
Michael Wright [Wed, 19 Mar 2014 18:51:26 +0000 (11:51 -0700)]
Respect ACTION_CANCEL for joystick fallbacks
Also change MotionEvent.PointerCoords bit packing and unpacking
methods to be consistent with BitSets which are now used on the
native PointerCoords object.
Bug:
11480300
Change-Id: Ic6c7ebda5c545d07ea1ed259ca1f1184ccf85f29
Chong Zhang [Tue, 25 Mar 2014 00:32:17 +0000 (00:32 +0000)]
am
2ac81ee6: (-s ours) am
c4e6233b: am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
2ac81ee6ba51708d5504db5762ef44aafefc6ee2':
DO NOT MERGE change Surface constructor arg to 64bit
Winson Chung [Tue, 25 Mar 2014 00:29:31 +0000 (17:29 -0700)]
am
c9b0d582: Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front."
* commit '
c9b0d582071c7b4fb2538b86e2e0c4c2f914b664':
Fixing issue where we were relaunching each activity from recents instead of bringing them to the front.
Chong Zhang [Tue, 25 Mar 2014 00:26:11 +0000 (00:26 +0000)]
am
c4e6233b: am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
c4e6233b2097dbd23927a9a247229ab67f41e4f8':
DO NOT MERGE change Surface constructor arg to 64bit
Winson Chung [Tue, 25 Mar 2014 00:24:14 +0000 (00:24 +0000)]
Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front."
Winson Chung [Tue, 25 Mar 2014 00:22:30 +0000 (17:22 -0700)]
Fixing issue where we were relaunching each activity from recents instead of bringing them to the front.
Chong Zhang [Tue, 25 Mar 2014 00:20:03 +0000 (00:20 +0000)]
am
b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
* commit '
b68d38e81fd779011e478dcf9911fbe77f71f20e':
DO NOT MERGE change Surface constructor arg to 64bit
Ruben Brunk [Tue, 25 Mar 2014 00:17:31 +0000 (17:17 -0700)]
am
0dfdcb10: Merge "camera3: Update whiteLevel/greenSplit docs."
* commit '
0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9':
camera3: Update whiteLevel/greenSplit docs.
Sailesh Nepal [Tue, 25 Mar 2014 00:17:01 +0000 (00:17 +0000)]
Merge "Add audio mode APIs" into master-nova
Ruben Brunk [Tue, 25 Mar 2014 00:12:21 +0000 (00:12 +0000)]
Merge "camera3: Update whiteLevel/greenSplit docs."
Ruben Brunk [Tue, 25 Mar 2014 00:10:35 +0000 (17:10 -0700)]
camera3: Update whiteLevel/greenSplit docs.
Bug:
13191430
Change-Id: I61cab65da546bdf1a748f46c28b6fce218b27bc4
Winson Chung [Mon, 24 Mar 2014 23:09:26 +0000 (16:09 -0700)]
am
75c549c5: Merge "Moving task view layout into resource."
* commit '
75c549c537cf44d1f1bb13422a950637f7f5c489':
Moving task view layout into resource.
Winson Chung [Mon, 24 Mar 2014 23:03:37 +0000 (23:03 +0000)]
Merge "Moving task view layout into resource."
John Spurlock [Mon, 24 Mar 2014 23:00:43 +0000 (16:00 -0700)]
am
66c49bc9: am
c3b7a671: (-s ours) am
e2cae0a6: am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
66c49bc99d3e33c00c3f674fca9cba06d1abc199':
Unhide Notification kind, rename to category.
Winson Chung [Mon, 24 Mar 2014 21:53:07 +0000 (14:53 -0700)]
Moving task view layout into resource.
- Using new activity icon/labels
Change-Id: If27bf60d2df75813213e9f3095baeb03085da8f7
John Spurlock [Mon, 24 Mar 2014 22:54:20 +0000 (22:54 +0000)]
am
c3b7a671: (-s ours) am
e2cae0a6: am
2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '
c3b7a6718290dfc0cbd63039e76292f2ba35e43b':
Unhide Notification kind, rename to category.
John Reck [Mon, 24 Mar 2014 22:53:35 +0000 (15:53 -0700)]
am
78ce1c52: Add back clobbered cleanup
* commit '
78ce1c5247de60a4247d81d168fd9fa97c7591d0':
Add back clobbered cleanup
John Reck [Mon, 24 Mar 2014 22:43:49 +0000 (15:43 -0700)]
Add back clobbered cleanup
Change-Id: I418b612710850bbc3033c4bd0143fb0f0befd2cb
Jose Lima [Mon, 24 Mar 2014 22:38:02 +0000 (15:38 -0700)]
am
41c2d2ce: Merge "resolved conflicts for merge of
6c45157c to master"
* commit '
41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe':
Added isGame application tag to the manifest
John Reck [Mon, 24 Mar 2014 22:37:59 +0000 (15:37 -0700)]
am
2ddf5166: Merge "Add stagingProperties"
* commit '
2ddf5166ea1da32f7ac63392f369f8a3c36a16df':
Add stagingProperties
Jose Lima [Mon, 24 Mar 2014 22:35:08 +0000 (22:35 +0000)]
Merge "resolved conflicts for merge of
6c45157c to master"
John Reck [Mon, 24 Mar 2014 22:34:46 +0000 (22:34 +0000)]
Merge "Add stagingProperties"
Jose Lima [Mon, 24 Mar 2014 22:33:25 +0000 (15:33 -0700)]
resolved conflicts for merge of
6c45157c to master
Change-Id: I95d7f927f4321405318b44a21172b99f3f16e00a
Ricardo Cervera [Mon, 24 Mar 2014 22:32:33 +0000 (15:32 -0700)]
am
ae5d7d5d: docs: Added new sensor types. Bug:
10674725
* commit '
ae5d7d5d61def1c7af9d69d3e72a0f5f4a8a6414':
docs: Added new sensor types. Bug:
10674725
John Reck [Thu, 20 Mar 2014 23:28:56 +0000 (16:28 -0700)]
Add stagingProperties
Change-Id: Ic7de551f8843fd70a77f738e33028e25c020bb3c
Ricardo Cervera [Wed, 12 Mar 2014 16:15:06 +0000 (09:15 -0700)]
docs: Added new sensor types. Bug:
10674725
Original SHA-1: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b
Original Conflicts:
docs/html/guide/topics/sensors/sensors_motion.jd
Change-Id: I8f8632410b2756174ea4dfab8d58486e58cd8db2
Dianne Hackborn [Mon, 24 Mar 2014 22:00:00 +0000 (15:00 -0700)]
Dianne Hackborn [Mon, 24 Mar 2014 21:53:39 +0000 (14:53 -0700)]
Fix build.
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
Mark Renouf [Mon, 24 Mar 2014 21:30:51 +0000 (14:30 -0700)]
am
de02cdc1: am
7390d4ab: am
3796594c: am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
de02cdc1e95cea19b2ddef26d60ad1d109bd507c':
Run finalizers before counting for StrictMode.
Craig Mautner [Mon, 24 Mar 2014 21:30:42 +0000 (14:30 -0700)]
am
452fd493: am
5332706b: am
b98ee1eb: am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
452fd49369da80a460d43fcb7e71d8549268f378':
Set ScreenshotSurface secure if any secure content is shown.
Jinsuk Kim [Mon, 24 Mar 2014 21:30:39 +0000 (14:30 -0700)]
am
1c855178: am
775a097f: am
3c34e5db: am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
1c855178e497f7ba788dadb87167f1e6735d10cb':
Add HdmiCecManager
Chris Craik [Mon, 24 Mar 2014 21:27:11 +0000 (14:27 -0700)]
am
76c30ce3: Merge "Rework Outline API, remove isolatedZVolume remnants"
* commit '
76c30ce3c1d8f1a818502aaea2c42c84d6bd3f92':
Rework Outline API, remove isolatedZVolume remnants
Mark Renouf [Mon, 24 Mar 2014 21:25:41 +0000 (21:25 +0000)]
am
7390d4ab: am
3796594c: am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
7390d4ab8d12d5ffa5d28341096f4425247204a0':
Run finalizers before counting for StrictMode.
Craig Mautner [Mon, 24 Mar 2014 21:25:37 +0000 (21:25 +0000)]
am
5332706b: am
b98ee1eb: am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
5332706b87c8772b97198e30c7cb4cc4ef3b577f':
Set ScreenshotSurface secure if any secure content is shown.
Jinsuk Kim [Mon, 24 Mar 2014 21:25:21 +0000 (21:25 +0000)]
am
775a097f: am
3c34e5db: am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
775a097f01a349548d2124ae9d7dd562c72eaa27':
Add HdmiCecManager
Chris Craik [Mon, 24 Mar 2014 21:22:35 +0000 (21:22 +0000)]
Merge "Rework Outline API, remove isolatedZVolume remnants"
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
DO NOT MERGE change Surface constructor arg to 64bit
Bug:
12799017
Bug:
12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
(cherry picked from commit
af608e81d450b962a443a21fb1a6feadeb355fe1)
Craig Mautner [Mon, 24 Mar 2014 20:57:47 +0000 (13:57 -0700)]
am
f114a5c4: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"
* commit '
f114a5c4d123af574dbae89befc3be61a01d1382':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Mon, 24 Mar 2014 20:52:13 +0000 (20:52 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"
Dianne Hackborn [Mon, 24 Mar 2014 20:46:08 +0000 (13:46 -0700)]
am
43111e89: Merge "Battery stats: wake locks, radio active, cleanup."
* commit '
43111e897be9f79ababb0ecf99f155695416d956':
Battery stats: wake locks, radio active, cleanup.
Dianne Hackborn [Mon, 24 Mar 2014 20:42:30 +0000 (20:42 +0000)]
Merge "Battery stats: wake locks, radio active, cleanup."
Dianne Hackborn [Mon, 24 Mar 2014 20:36:46 +0000 (13:36 -0700)]
Battery stats: wake locks, radio active, cleanup.
- Improve wake lock work source updates to also update the current
history tag, in case the new work source gets recorded in the
history.
- Fix bug in recording radio active time that was not distributing
any time to apps.
- No longer hold a wake lock while dispatching data conn active call,
since it comes with its own timestamp.
- Fix issue where the top app was not being cleared while the screen
was off.
- Remove obsolete STATS_LAST stats type.
- Fix bug that was not clearing the total run time when resetting
the stats.
Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30
Will Haldean Brown [Mon, 24 Mar 2014 20:31:08 +0000 (13:31 -0700)]
am
48a5dbd3: Update current.txt for offset attributes.
* commit '
48a5dbd3cc5dd8a919983455757dc4c7b82500ab':
Update current.txt for offset attributes.
Will Haldean Brown [Mon, 24 Mar 2014 20:23:42 +0000 (13:23 -0700)]
Update current.txt for offset attributes.
Change-Id: I0f88a6f327edfc207c081e424e3c97edd1451c90
quddusc [Mon, 24 Mar 2014 19:45:14 +0000 (12:45 -0700)]
am
370cd467: am
87eac093: am
5771d425: am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
370cd4677b8ee6c8b97291b02fb0c28fd275965e':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Mon, 24 Mar 2014 19:45:10 +0000 (12:45 -0700)]
am
0d828311: am
ce6307d3: am
3ee70ca4: am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
0d828311ba0bc40245bc5a20a15258d8621f0245':
docs: Added Javadoc for Gcore Jarlsberg release.
Selim Cinek [Mon, 24 Mar 2014 19:45:07 +0000 (12:45 -0700)]
am
4c01eccb: am
38fc02d4: am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
4c01eccb0c06fb83532cad00cbf9a4b47b6dc1f8':
Disable Set Wallpaper button while loading image
Chad Brubaker [Mon, 24 Mar 2014 19:45:04 +0000 (12:45 -0700)]
am
87f738d2: am
51e93804: am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
87f738d2787444854cd15695b599b84b25027167':
Fix support for simultaneous VPN tuns
Chad Brubaker [Mon, 24 Mar 2014 19:45:01 +0000 (12:45 -0700)]
am
ff3bb2fe: am
7f623d6b: am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
ff3bb2fe95a7d0158f5a456368eb7fa91069bc23':
Include the interface for clearDnsInterfaceForUidRange
Ricardo Cervera [Mon, 24 Mar 2014 19:44:58 +0000 (12:44 -0700)]
am
b7fe3363: am
1575e1a1: (-s ours) am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
b7fe33633b49924c35751d4e5796f8add4ad623c':
docs: Added new sensor types. Bug:
10674725
quddusc [Mon, 24 Mar 2014 19:36:50 +0000 (19:36 +0000)]
am
87eac093: am
5771d425: am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
87eac09358a49473549fa30e4acbf93c66b8915e':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Mon, 24 Mar 2014 19:36:45 +0000 (19:36 +0000)]
am
ce6307d3: am
3ee70ca4: am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
ce6307d3c84ebf200e35cabf70cf49712ac14e04':
docs: Added Javadoc for Gcore Jarlsberg release.
Selim Cinek [Mon, 24 Mar 2014 19:36:14 +0000 (19:36 +0000)]
am
38fc02d4: am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
38fc02d4efa9e943ab38306d466c5fe2786f1bb7':
Disable Set Wallpaper button while loading image
Chad Brubaker [Mon, 24 Mar 2014 19:35:25 +0000 (19:35 +0000)]
am
51e93804: am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
51e938041e72f29c4e776a8627ea9d8a70d62728':
Fix support for simultaneous VPN tuns
Chad Brubaker [Mon, 24 Mar 2014 19:35:20 +0000 (19:35 +0000)]
am
7f623d6b: am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
Include the interface for clearDnsInterfaceForUidRange
Ricardo Cervera [Mon, 24 Mar 2014 19:35:11 +0000 (19:35 +0000)]
am
1575e1a1: (-s ours) am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
1575e1a1f5c6a0e1d870af88cba8d54023dfbcab':
docs: Added new sensor types. Bug:
10674725
Chris Wren [Mon, 24 Mar 2014 19:00:43 +0000 (12:00 -0700)]
am
8ed3b587: Merge "add more dump info for heads up notifications"
* commit '
8ed3b587f00ccb1b4264d2ee3590af32464428c9':
add more dump info for heads up notifications
Chris Wren [Mon, 24 Mar 2014 18:57:06 +0000 (18:57 +0000)]
Merge "add more dump info for heads up notifications"
John Reck [Mon, 24 Mar 2014 18:48:42 +0000 (11:48 -0700)]
am
1e1f4d70: am
02e99e27: am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
1e1f4d705edaad3700b49c730bc8a22c522cb46b':
Eliminate mHasAlpha
John Reck [Mon, 24 Mar 2014 18:44:01 +0000 (18:44 +0000)]
am
02e99e27: am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07':
Eliminate mHasAlpha
Dianne Hackborn [Mon, 24 Mar 2014 18:43:17 +0000 (11:43 -0700)]
am
48600b95: Merge "Fix issue #
13564072: Back button no longer dismisses IME after voice usage"
* commit '
48600b95cad8d49772ca5634a317b893d2346f42':
Fix issue #
13564072: Back button no longer dismisses IME after voice usage
Dianne Hackborn [Mon, 24 Mar 2014 18:43:14 +0000 (11:43 -0700)]
am
7d867342: Merge "Get rid of not specifying a user errors in bluetooth."
* commit '
7d86734297bf6c2f71404498567cc92576591b8c':
Get rid of not specifying a user errors in bluetooth.
OSDN Git Service
