OSDN Git Service
Andre Eisenbach [Tue, 2 Dec 2014 08:14:11 +0000 (08:14 +0000)]
am
fcb94852: am
a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev
* commit '
fcb948526ff400b0773a44aecd56c366c13efa98':
Add server-side callback for change in MTU (4/4)
Andre Eisenbach [Tue, 2 Dec 2014 08:07:48 +0000 (08:07 +0000)]
am
a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev
* commit '
a1a6c300afffebfb46e84dc1941f6bddca145a8f':
Add server-side callback for change in MTU (4/4)
Andre Eisenbach [Tue, 2 Dec 2014 08:01:59 +0000 (08:01 +0000)]
Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev
Jinsuk Kim [Tue, 2 Dec 2014 07:36:10 +0000 (07:36 +0000)]
am
bfe763d1: am
b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev
* commit '
bfe763d1c96fe0f8e704743160a478d2e698a801':
audioservice: system audio control in master volume mode
Dongwon Kang [Tue, 2 Dec 2014 07:36:05 +0000 (07:36 +0000)]
am
3599af39: am
7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev
* commit '
3599af39e45af0498daa4873216a8cf4d6fe67f9':
TIF: fix a race condition when TvInputManager is initialized
Erik Kline [Tue, 2 Dec 2014 07:35:59 +0000 (07:35 +0000)]
am
d125266b: am
f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
* commit '
d125266b3c0cabcb42e6331a312c66071fedd752':
Revert some verbose logging from ag/489226
Jinsuk Kim [Tue, 2 Dec 2014 07:29:16 +0000 (07:29 +0000)]
am
b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev
* commit '
b4355ec3d0f7ab0aa44a746df7df250466cd701e':
audioservice: system audio control in master volume mode
Dongwon Kang [Tue, 2 Dec 2014 07:29:10 +0000 (07:29 +0000)]
am
7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev
* commit '
7cfe00f69380573e9c989bbbc614930c279f2291':
TIF: fix a race condition when TvInputManager is initialized
Erik Kline [Tue, 2 Dec 2014 07:29:05 +0000 (07:29 +0000)]
am
f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
* commit '
f27b52aaa75884a41ea687116ff3758125b94e39':
Revert some verbose logging from ag/489226
Jinsuk Kim [Tue, 2 Dec 2014 07:26:39 +0000 (07:26 +0000)]
Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev
Dongwon Kang [Tue, 2 Dec 2014 07:26:05 +0000 (07:26 +0000)]
Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev
Erik Kline [Tue, 2 Dec 2014 07:22:29 +0000 (07:22 +0000)]
Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
Lorenzo Colitti [Tue, 2 Dec 2014 07:00:45 +0000 (07:00 +0000)]
am
28ca40ff: am
32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev
* commit '
28ca40ff78dc5e62d0e26e7340b74ad6e5ba767e':
Only use mDefaultDns if the network claims to offer Internet
Lorenzo Colitti [Tue, 2 Dec 2014 06:53:53 +0000 (06:53 +0000)]
am
32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev
* commit '
32f3518dccf5c599c21b54095abe561f48277898':
Only use mDefaultDns if the network claims to offer Internet
Lorenzo Colitti [Tue, 2 Dec 2014 06:47:49 +0000 (06:47 +0000)]
Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev
Sungsoo Lim [Tue, 2 Dec 2014 03:40:46 +0000 (03:40 +0000)]
am
1f35568d: am
5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev
* commit '
1f35568d075e8c0401e3b00591dde2f6f3218b48':
Missing Javadoc update while API review
Sungsoo Lim [Tue, 2 Dec 2014 03:33:22 +0000 (03:33 +0000)]
am
5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev
* commit '
5a7445b00d267db966cc72cd905aaf2379e64b6b':
Missing Javadoc update while API review
Sungsoo Lim [Tue, 2 Dec 2014 03:29:07 +0000 (03:29 +0000)]
Merge "Missing Javadoc update while API review" into lmp-mr1-dev
Yigit Boyar [Tue, 2 Dec 2014 02:19:22 +0000 (02:19 +0000)]
am
d11e2b7c: am
498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev
* commit '
d11e2b7cdd283ebfd2c41e7616a54bcc084d0a30':
Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
Yigit Boyar [Tue, 2 Dec 2014 02:12:06 +0000 (02:12 +0000)]
am
498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev
* commit '
498c84e7366cc0b4355f034bd03534a14beaf166':
Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
Alan Viverette [Tue, 2 Dec 2014 02:10:12 +0000 (02:10 +0000)]
am
cc636f08: am
4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev
* commit '
cc636f08249011f0e99b7d7ddfca31e2c7a9bec3':
Only send haptic events from time picker when time changes
Yigit Boyar [Tue, 2 Dec 2014 02:07:24 +0000 (02:07 +0000)]
Merge "Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev
Alan Viverette [Tue, 2 Dec 2014 02:03:49 +0000 (02:03 +0000)]
am
4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev
* commit '
4515f785878cb150bef467d40abc9d5b172570fe':
Only send haptic events from time picker when time changes
Alan Viverette [Tue, 2 Dec 2014 01:58:30 +0000 (01:58 +0000)]
Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev
Zhijun He [Tue, 2 Dec 2014 01:54:29 +0000 (01:54 +0000)]
am
c8d1b107: am
217814bf: Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev
* commit '
c8d1b107b0c05157b102be61c43131dd6992aad2':
ImageReader: free direct byte buffers once Image is returned
Zhijun He [Tue, 2 Dec 2014 01:48:45 +0000 (01:48 +0000)]
am
217814bf: Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev
* commit '
217814bf2bef703be8b24cd4f1ea454ca6638111':
ImageReader: free direct byte buffers once Image is returned
Zhijun He [Tue, 2 Dec 2014 01:44:42 +0000 (01:44 +0000)]
Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev
Pavel Zhamaitsiak [Tue, 2 Dec 2014 01:39:26 +0000 (01:39 +0000)]
am
75371fd7: am
73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev
* commit '
75371fd7eeda52cb04a77b4e218c470c79e20402':
MSIM IMS: convert to phone ID based selection.
Chris Craik [Tue, 2 Dec 2014 01:39:20 +0000 (01:39 +0000)]
am
9a04480e: am
ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev
* commit '
9a04480e36c42eb63d1d727221ba3ce6a6d533ef':
Clip outline to View clip bounds for shadow computation
Pavel Zhamaitsiak [Tue, 2 Dec 2014 01:33:34 +0000 (01:33 +0000)]
am
73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev
* commit '
73f1047318fdbfddce7edaa387725563890b5c73':
MSIM IMS: convert to phone ID based selection.
Chris Craik [Tue, 2 Dec 2014 01:33:28 +0000 (01:33 +0000)]
am
ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev
* commit '
ef124887c616d03cf0a689d2b7d5b1894405d12e':
Clip outline to View clip bounds for shadow computation
Pavel Zhamaitsiak [Tue, 2 Dec 2014 01:27:54 +0000 (01:27 +0000)]
Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev
Chris Craik [Tue, 2 Dec 2014 01:27:24 +0000 (01:27 +0000)]
Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev
Ihab Awad [Tue, 2 Dec 2014 01:19:31 +0000 (01:19 +0000)]
am
8ea0d19f: am
93b42924: Merge "Fix immutability bug in ag/587241" into lmp-mr1-dev
* commit '
8ea0d19fe2522ceaf5f09808b7835deb9e53c88a':
Fix immutability bug in http://ag/587241
Ihab Awad [Tue, 2 Dec 2014 01:11:32 +0000 (01:11 +0000)]
am
93b42924: Merge "Fix immutability bug in ag/587241" into lmp-mr1-dev
* commit '
93b429247673bb8e019fe9d39b46700fc86c3313':
Fix immutability bug in http://ag/587241
Ihab Awad [Tue, 2 Dec 2014 01:00:07 +0000 (01:00 +0000)]
Merge "Fix immutability bug in ag/587241" into lmp-mr1-dev
Ihab Awad [Tue, 2 Dec 2014 00:23:17 +0000 (16:23 -0800)]
Fix immutability bug in http://ag/587241
Bug:
18292176
Change-Id: Icf1f717d76f042d9950a1d8cca9def061de1c1b8
Adam Powell [Tue, 2 Dec 2014 00:56:48 +0000 (00:56 +0000)]
am
920c27b2: am
4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
* commit '
920c27b24aada088aae0b9644fcf5519575e0433':
Make work profile apps easier to pick in ResolverActivity
Jeff Sharkey [Tue, 2 Dec 2014 00:51:28 +0000 (00:51 +0000)]
am
a8d0a3ae: am
2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
* commit '
a8d0a3ae602bb455e290ca1ee6f18184c30f8dc7':
Include splits in dumpsys package output.
Adam Powell [Tue, 2 Dec 2014 00:50:39 +0000 (00:50 +0000)]
am
4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
* commit '
4cd577f0ac1df92ffbf196d1fb31a7124bbe2f51':
Make work profile apps easier to pick in ResolverActivity
Jesse Hall [Tue, 2 Dec 2014 00:48:33 +0000 (00:48 +0000)]
am
9dec9e9d: am
1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '
9dec9e9d65c9f70b7a45fb3ad8f3f752b7b35fdf':
Avoid overwriting EGL14.EGL_NO_SURFACE
Adam Powell [Tue, 2 Dec 2014 00:46:00 +0000 (00:46 +0000)]
Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
Jeff Sharkey [Tue, 2 Dec 2014 00:45:44 +0000 (00:45 +0000)]
am
2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
* commit '
2705387df6f3ffe87b2a3a71a48eea7e2be44fb1':
Include splits in dumpsys package output.
Adam Powell [Fri, 21 Nov 2014 02:17:00 +0000 (18:17 -0800)]
Make work profile apps easier to pick in ResolverActivity
Pull the "Work" profile item up out of the main list and into the
header of the resolver drawer, making it easier to discover and access
without disrupting the sort order of the list.
Bug
17935301
Change-Id: Id2d081b61828352c998e517127132f883a20b7ef
Jesse Hall [Tue, 2 Dec 2014 00:42:23 +0000 (00:42 +0000)]
am
1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '
1ee377764a59d0e2c245dd037006fa8c086f5683':
Avoid overwriting EGL14.EGL_NO_SURFACE
Jeff Sharkey [Tue, 2 Dec 2014 00:39:40 +0000 (00:39 +0000)]
Merge "Include splits in dumpsys package output." into lmp-mr1-dev
Jeff Sharkey [Tue, 2 Dec 2014 00:24:01 +0000 (16:24 -0800)]
Include splits in dumpsys package output.
Describe the currently installed splits, both in normal dumpsys
output and in checkin output. Also include revisionCode of those
splits when defined (non-zero).
Bug:
18576300
Change-Id: Ie8140961fb7b9e0ed23fd6bc267157aab075dd78
Jesse Hall [Tue, 2 Dec 2014 00:35:11 +0000 (00:35 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
Dongwon Kang [Thu, 27 Nov 2014 10:34:18 +0000 (19:34 +0900)]
TIF: fix a race condition when TvInputManager is initialized
Currently, TvInputManagerService notifies the initial state of each
input via TvInputManagetCallback#onInputStateChanged after TvInputManager
is created. However, this is racy because the client may call methods
like getTvInputState() before the initialization.
This patch makes sure that the client gets the control when the initialization
finishes completely.
Bug:
18419452
Change-Id: I5d8141c20984013e68f2809120710c670557c9ad
Christopher Tate [Tue, 2 Dec 2014 00:30:40 +0000 (00:30 +0000)]
am
4bdf266c: am
c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
* commit '
4bdf266c03d92448ae65ec31355588d17d179a98':
Don't crash if a system restore fails before constructing the PMBA
Christopher Tate [Tue, 2 Dec 2014 00:24:03 +0000 (00:24 +0000)]
am
c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
* commit '
c70fc4a32016f3f06aa80596a7d9b4e9614e78bc':
Don't crash if a system restore fails before constructing the PMBA
Christopher Tate [Tue, 2 Dec 2014 00:18:43 +0000 (00:18 +0000)]
Merge "Don't crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
Alan Viverette [Tue, 2 Dec 2014 00:13:32 +0000 (16:13 -0800)]
Only send haptic events from time picker when time changes
BUG:
18572841
Change-Id: Iaa26e2f0804e301f8754e19a1d03dbd2142bf044
dcashman [Mon, 1 Dec 2014 23:59:50 +0000 (23:59 +0000)]
am
c25cfc57: am
24d02652: Merge "Prevent EntropyMixer from registering with service manager."
* commit '
c25cfc57e0d863b002620f5e7dd14822418c678f':
Prevent EntropyMixer from registering with service manager.
Michael Wright [Mon, 1 Dec 2014 23:59:44 +0000 (23:59 +0000)]
am
6b35af89: am
c859b85c: Merge "Added Razer USA, Ltd serval"
* commit '
6b35af89f0ce612307d89a45c7fadab3e6e269f3':
Added Razer USA, Ltd serval
Zhijun He [Wed, 26 Nov 2014 21:24:48 +0000 (13:24 -0800)]
ImageReader: free direct byte buffers once Image is returned
This can prevent apps from accessing an image byte buffer when it is closed.
Bug:
12528089
Change-Id: I04dccf1832204be2ae3aeb3bbe04f616886447e6
dcashman [Mon, 1 Dec 2014 23:54:11 +0000 (23:54 +0000)]
am
24d02652: Merge "Prevent EntropyMixer from registering with service manager."
* commit '
24d02652bf8df12a41acf500d958109ef3d99b9a':
Prevent EntropyMixer from registering with service manager.
Michael Wright [Mon, 1 Dec 2014 23:54:04 +0000 (23:54 +0000)]
am
c859b85c: Merge "Added Razer USA, Ltd serval"
* commit '
c859b85cb530e608da775bb18744a996483a0311':
Added Razer USA, Ltd serval
dcashman [Mon, 1 Dec 2014 23:49:25 +0000 (23:49 +0000)]
Merge "Prevent EntropyMixer from registering with service manager."
Michael Wright [Mon, 1 Dec 2014 23:47:37 +0000 (23:47 +0000)]
Merge "Added Razer USA, Ltd serval"
Chris Craik [Mon, 1 Dec 2014 21:44:21 +0000 (13:44 -0800)]
Clip outline to View clip bounds for shadow computation
bug:
18509823
This allows animations of View clipBounds (and other callers of
setClipBounds) to affect shadows, instead of leaving them floating.
Change-Id: I249fa4b371a170cb0c54001f5b0e0097e109b8b8
Yuncheol Heo [Mon, 1 Dec 2014 23:45:07 +0000 (23:45 +0000)]
am
1d22f99d: am
f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit '
1d22f99da94f131c8047870a8c090b39630f5069':
CEC: make it sure to send vendor commands when changing a setting.
Yuncheol Heo [Mon, 1 Dec 2014 23:39:17 +0000 (23:39 +0000)]
am
f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit '
f17024873b10dabed069e502030dd85d6257c0c4':
CEC: make it sure to send vendor commands when changing a setting.
Etan Cohen [Sat, 27 Sep 2014 05:35:02 +0000 (22:35 -0700)]
MSIM IMS: convert to phone ID based selection.
Bug:
18576822
Change-Id: I2a756782ccdab5e4d10193c593cf89a7aa4fcda4
Yuncheol Heo [Thu, 27 Nov 2014 10:52:01 +0000 (19:52 +0900)]
CEC: make it sure to send vendor commands when changing a setting.
- Remove 'oneway' from IHdmiVendorCommandListener.
- Add flush() method to HdmiCecController.
- Use IoThread for HdmiCecController.
Bug:
18495592
Change-Id: I497f7b49e94dd4402058ecc89cb5b7a3d58bf1e1
John Reck [Mon, 1 Dec 2014 22:49:09 +0000 (22:49 +0000)]
am
2bec5766: am
76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
* commit '
2bec576627c1df95b7dae1bc65d250215218f175':
Prevent calling GL functions with an invalid surface
John Reck [Mon, 1 Dec 2014 22:44:32 +0000 (22:44 +0000)]
am
76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
* commit '
76de89820c51c4bc288b440a82374b9d6c806244':
Prevent calling GL functions with an invalid surface
John Reck [Mon, 1 Dec 2014 22:39:29 +0000 (22:39 +0000)]
Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
Christopher Tate [Mon, 1 Dec 2014 22:37:28 +0000 (14:37 -0800)]
Don't crash if a system restore fails before constructing the PMBA
If a whole-system restore operation failed at just the wrong point,
we'd wind up in the teardown code without a certain vital bit of it
having been initialized, and crash on the null pointer. Now we
recognize this failure mode and make sure not to do that.
Bug
18574450
Change-Id: Ifa2c10ce16bb3c6bc916ed7151c5fd51b7225691
Alan Viverette [Mon, 1 Dec 2014 22:18:58 +0000 (22:18 +0000)]
am
23dc0563: am
e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
* commit '
23dc05634d7bc4a1d436b27dc4cd8bc518834e49':
Fix visible rect computation for views with padding
Alan Viverette [Mon, 1 Dec 2014 22:12:44 +0000 (22:12 +0000)]
am
e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
* commit '
e6bd61d5bbea012b6b80c8bff915042f615630bc':
Fix visible rect computation for views with padding
Alan Viverette [Mon, 1 Dec 2014 22:06:11 +0000 (22:06 +0000)]
Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
Ihab Awad [Mon, 1 Dec 2014 21:46:04 +0000 (21:46 +0000)]
am
1503623c: am
ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
* commit '
1503623c73935e71ff7c2e4d6bbdf546e7f0b37d':
Fix to a compatibility patch that was missed in ag/587241
John Reck [Mon, 1 Dec 2014 21:40:32 +0000 (21:40 +0000)]
am
d51205fd: am
6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit '
d51205fda7351ca32e54ef34b32e72f6c7c79847':
Prevent calling GL functions with an invalid surface
Ihab Awad [Mon, 1 Dec 2014 21:40:12 +0000 (21:40 +0000)]
am
ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
* commit '
ac70c6473160d96aa8adf4677e3dde320256ef8d':
Fix to a compatibility patch that was missed in ag/587241
Sangkyu Lee [Fri, 21 Nov 2014 09:05:41 +0000 (18:05 +0900)]
Prevent calling GL functions with an invalid surface
Bug:
18518580
When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)
Cherry picked from AOSP:
f76d36f96bf221672e98e440c9df7cbf0e02e84e
Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
John Reck [Mon, 1 Dec 2014 21:35:40 +0000 (21:35 +0000)]
am
6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit '
6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
Prevent calling GL functions with an invalid surface
Ihab Awad [Mon, 1 Dec 2014 21:35:28 +0000 (21:35 +0000)]
Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
John Reck [Mon, 1 Dec 2014 21:28:26 +0000 (21:28 +0000)]
Merge "Prevent calling GL functions with an invalid surface"
Craig Mautner [Mon, 1 Dec 2014 21:06:36 +0000 (21:06 +0000)]
am
94dab3ae: am
9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev
* commit '
94dab3ae5468e2c6325b47aa633d08dc7727198b':
Force additional layout pass after drawing
Craig Mautner [Mon, 1 Dec 2014 21:00:51 +0000 (21:00 +0000)]
am
9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev
* commit '
9dba10732802bf162c0098d2591aa284e55b7b5e':
Force additional layout pass after drawing
Craig Mautner [Mon, 1 Dec 2014 20:56:07 +0000 (20:56 +0000)]
Merge "Force additional layout pass after drawing" into lmp-mr1-dev
Wale Ogunwale [Mon, 1 Dec 2014 20:37:01 +0000 (20:37 +0000)]
am
e05fbd69: am
997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
* commit '
e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
Added unique id to display devices and their settings.
Wale Ogunwale [Mon, 1 Dec 2014 20:30:33 +0000 (20:30 +0000)]
am
997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
* commit '
997e632f59b070dabf71d9e807847c0643da92ac':
Added unique id to display devices and their settings.
Ihab Awad [Mon, 1 Dec 2014 20:19:57 +0000 (12:19 -0800)]
Fix to a compatibility patch that was missed in ag/587241
Change-Id: I2339085a9a2cc0d6a3f4b5e07130b5178a62c729
Shishir Agrawal [Mon, 1 Dec 2014 20:29:07 +0000 (20:29 +0000)]
am
592707c5: am
089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
* commit '
592707c5250655cbed2b48848701b288605c01ac':
TelephonyManager.setLine1NumberForDisplay should return a boolean.
Wale Ogunwale [Mon, 1 Dec 2014 20:26:05 +0000 (20:26 +0000)]
Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
Shishir Agrawal [Mon, 1 Dec 2014 20:22:36 +0000 (20:22 +0000)]
am
089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
* commit '
089f95f4483c95873cf0084c11cb23a0f5b32c3c':
TelephonyManager.setLine1NumberForDisplay should return a boolean.
Chris Craik [Mon, 1 Dec 2014 20:21:07 +0000 (20:21 +0000)]
am
1fd78e92: am
659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
* commit '
1fd78e9268a5c884cfcfec2133b62a11a74dbc00':
Enable stencil clipping within clearLayerRegions
Shishir Agrawal [Mon, 1 Dec 2014 20:17:24 +0000 (20:17 +0000)]
Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
Chris Craik [Mon, 1 Dec 2014 20:13:06 +0000 (20:13 +0000)]
am
659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
* commit '
659de832b9796e14de44b6411980a65e33283a93':
Enable stencil clipping within clearLayerRegions
Chris Craik [Mon, 1 Dec 2014 20:08:27 +0000 (20:08 +0000)]
Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 20:01:21 +0000 (20:01 +0000)]
am
f93c82ae: (-s ours) am
f90404ca: (-s ours) am
ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f93c82ae366970b3c06dedf2b040d000c16d2261':
Import translations. DO NOT MERGE
Joe Fernandez [Mon, 1 Dec 2014 20:01:15 +0000 (20:01 +0000)]
am
2cbfc845: am
353da3f9: am
88e04fcb: am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
2cbfc8455d51cb89cdd161f5e46d1f56023c903b':
docs: December 2014 Dashboard update
smain@google.com [Mon, 1 Dec 2014 20:01:10 +0000 (20:01 +0000)]
am
e979e259: am
77e889ed: am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
e979e259d22279cd35f9ebcc7b42efbae1b77ce1':
change Trulia context image
Jeremy Joslin [Mon, 1 Dec 2014 20:01:02 +0000 (20:01 +0000)]
am
33783a96: am
500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '
33783a962f3336400d12cd739ae33b9452ea14be':
Fix the ordering of extra values in the PI.
Alan Viverette [Mon, 1 Dec 2014 20:00:49 +0000 (20:00 +0000)]
am
53644fb5: am
015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '
53644fb5acd394b875723b6483215ba837f8e6c0':
Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
Geoff Mendal [Mon, 1 Dec 2014 20:00:39 +0000 (20:00 +0000)]
am
533371c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
533371c5924cc467ec8dc31cd577390a37898c8d':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 1 Dec 2014 20:00:32 +0000 (20:00 +0000)]
am
05d455ca: am
b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit '
05d455ca2b83793a81aac2544c388eec8ac140cd':
Sanitize display names, keep extensions intact.
Jeff Sharkey [Mon, 1 Dec 2014 19:57:09 +0000 (11:57 -0800)]
resolved conflicts for merge of
916d5163 to lmp-mr1-dev-plus-aosp
Change-Id: I714b443d66feb7d7416152254d21cac87a6fa451
OSDN Git Service
