OSDN Git Service
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
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
Jesse Hall [Tue, 2 Dec 2014 00:35:11 +0000 (00:35 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
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
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
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"
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.
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
Geoff Mendal [Mon, 1 Dec 2014 19:50:17 +0000 (19:50 +0000)]
am
f90404ca: (-s ours) am
ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f90404ca7b47234437b3f8f418fca313825de02c':
Import translations. DO NOT MERGE
Joe Fernandez [Mon, 1 Dec 2014 19:50:12 +0000 (19:50 +0000)]
am
353da3f9: am
88e04fcb: am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
353da3f98d86eb750b756335892c768f76cc4616':
docs: December 2014 Dashboard update
smain@google.com [Mon, 1 Dec 2014 19:50:07 +0000 (19:50 +0000)]
am
77e889ed: am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
77e889ed84ea0f626a9164fad50299d131a1cac1':
change Trulia context image
Shishir Agrawal [Mon, 1 Dec 2014 19:48:53 +0000 (11:48 -0800)]
TelephonyManager.setLine1NumberForDisplay should return a boolean.
The call can fail and should return the success status of the call.
Bug:
18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
Jason Monk [Mon, 1 Dec 2014 19:48:42 +0000 (19:48 +0000)]
am
c0c34b42: am
03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
* commit '
c0c34b428f6d3de635bc832bbebdb7b9cb500ccd':
SysUI: QS Wifi get connected wifi rssi from NC
Amith Yamasani [Mon, 1 Dec 2014 19:48:36 +0000 (19:48 +0000)]
am
0c81034c: am
731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
* commit '
0c81034cac4efe7d538ff303cc9f2badbb22b8d8':
Fix parsing bug that affects reading back guest restrictions
Geoff Mendal [Mon, 1 Dec 2014 19:48:20 +0000 (19:48 +0000)]
am
e7f81f3b: (-s ours) am
6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
e7f81f3b684bde04432889943c5085ed1d2b9b1b':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Dec 2014 19:47:58 +0000 (19:47 +0000)]
am
23a99a3a: am
21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '
23a99a3ab09d90e3613b44a0962de7ed0028d620':
Volume: Improve inline volume controls used in settings.
Ihab Awad [Mon, 1 Dec 2014 19:47:23 +0000 (19:47 +0000)]
am
8199d6c3: am
6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev
* commit '
8199d6c3db16d786f15f1d643afe599dcfa6cf1e':
Telecom API updates (1/6)
Chet Haase [Mon, 1 Dec 2014 19:47:15 +0000 (19:47 +0000)]
am
8394e9ff: am
21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
* commit '
8394e9fff32c8935e021f0e4e84c5c1de913b96f':
Zero duration animations snap to end value when started
Geoff Mendal [Mon, 1 Dec 2014 19:47:03 +0000 (19:47 +0000)]
am
9e863741: (-s ours) am
3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
9e8637411a2a637e5795ff721ea6a92141cf76ec':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 19:46:57 +0000 (19:46 +0000)]
am
11fe2dfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
11fe2dfd3267c86c598dd443aaf471e8d490b4bb':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Dec 2014 19:46:50 +0000 (19:46 +0000)]
am
64e034e3: am
e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit '
64e034e351ad73b9cb99cb04511d0fea137c7a3b':
Zen: Improve zen mode panel condition selection.
John Spurlock [Mon, 1 Dec 2014 19:46:44 +0000 (19:46 +0000)]
am
c1e4d155: am
1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
* commit '
c1e4d1554f23db7f0de91a212d94a1b624dec64d':
Doze: Break out proxcheck stats by pulse reason.
John Spurlock [Mon, 1 Dec 2014 19:46:38 +0000 (19:46 +0000)]
am
fdc07dce: am
26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev
* commit '
fdc07dce372e94b274b725ba571c2ad4979565da':
Volume: Update remote volume icons.
Geoff Mendal [Mon, 1 Dec 2014 19:46:31 +0000 (19:46 +0000)]
am
68137588: (-s ours) am
9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit '
68137588d1a1924703a2b995b15293515c4ff418':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 19:46:24 +0000 (19:46 +0000)]
am
a990faec: (-s ours) Import translations. DO NOT MERGE
* commit '
a990faec871f4ca369e17c7bd36488747e890bc9':
Import translations. DO NOT MERGE
Wally Yau [Mon, 1 Dec 2014 19:46:11 +0000 (19:46 +0000)]
am
5b4e2e02: am
da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '
5b4e2e02744c676f2d282388c0d901494fe8a5b9':
Set stream volume to max when userMasterVolume is set to true.
Elliott Hughes [Mon, 1 Dec 2014 19:45:32 +0000 (19:45 +0000)]
am
7ff0b469: am
07b4a291: am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
7ff0b469950c225ab3a8a245b6c5ff49ba38497e':
Mention ProGuard in the JNI documentation.
Geoff Mendal [Mon, 1 Dec 2014 19:44:10 +0000 (19:44 +0000)]
am
ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ff26f10fab3e79d535001b8e1c9155d7844375c4':
Import translations. DO NOT MERGE
Joe Fernandez [Mon, 1 Dec 2014 19:44:04 +0000 (19:44 +0000)]
am
88e04fcb: am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
docs: December 2014 Dashboard update
smain@google.com [Mon, 1 Dec 2014 19:43:58 +0000 (19:43 +0000)]
am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
446bab79564e50c497e6ce5cf75a30ddd94855fe':
change Trulia context image
Jeremy Joslin [Mon, 1 Dec 2014 19:42:24 +0000 (19:42 +0000)]
am
500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '
500f781110dee5aad53410e9ef9b4003123c6981':
Fix the ordering of extra values in the PI.
Jeremy Joslin [Mon, 1 Dec 2014 19:36:01 +0000 (19:36 +0000)]
Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
Adrian Roos [Mon, 1 Dec 2014 19:33:21 +0000 (19:33 +0000)]
am
17e0a7e7: am
09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev
* commit '
17e0a7e7ac289deacff01c84591dae4009f86415':
Fix projection permission dialog layering
Geoff Mendal [Mon, 1 Dec 2014 19:32:36 +0000 (19:32 +0000)]
am
de3f61f4: (-s ours) am
7028dec6: (-s ours) am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
de3f61f46616ed42c03fc8f171324e011ddbcc5d':
Import translations. DO NOT MERGE
Scott Main [Mon, 1 Dec 2014 19:32:31 +0000 (19:32 +0000)]
am
cd79f9f0: am
4a45a441: am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
cd79f9f0f4a3fb3527023450839313aa67e5e106':
docs:advmgr-updates
smain@google.com [Mon, 1 Dec 2014 19:32:25 +0000 (19:32 +0000)]
am
b8de593e: am
576e248f: am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
b8de593ec2ca04009835960357c59feff28af551':
define height for context images to avoid content jumps on load
Narayan Kamath [Mon, 1 Dec 2014 19:32:12 +0000 (19:32 +0000)]
am
ff45e7df: am
1d184ace: resolved conflicts for merge of
7377998d to lmp-mr1-dev
* commit '
ff45e7df8aae0f55ce719de92102c7d522b62048':
Be increasingly aggressive about fstrim if it isn't being run
Amit Mahajan [Mon, 1 Dec 2014 19:32:06 +0000 (19:32 +0000)]
am
b957d11a: am
4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
* commit '
b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
Change to use DATA_ROAMING setting correctly with subId.
Alan Viverette [Mon, 1 Dec 2014 19:17:30 +0000 (19:17 +0000)]
am
015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '
015b9e56d4ad528dd406672ef6264c85e41a20fd':
Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
Alan Viverette [Mon, 1 Dec 2014 19:12:47 +0000 (19:12 +0000)]
Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 19:11:02 +0000 (19:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 1 Dec 2014 19:09:20 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48e6cd1b92557727fbd8ee2d803f0121538831d9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 19:04:58 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Jeff Sharkey [Mon, 1 Dec 2014 19:00:56 +0000 (19:00 +0000)]
am
b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit '
b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
Sanitize display names, keep extensions intact.
Jeff Sharkey [Mon, 1 Dec 2014 19:00:51 +0000 (19:00 +0000)]
am
e4a5faa6: Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
* commit '
e4a5faa61e9084333b241531ddb941684f110566':
APK still has privileged flag after being moved from "/system/priv-app"
Geoff Mendal [Mon, 1 Dec 2014 18:59:03 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic9c2d5dfcae9b229040c8460ab2a9820d44fa18c
Auto-generated-cl: translation import
Joe Fernandez [Mon, 1 Dec 2014 18:58:36 +0000 (18:58 +0000)]
am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
e9a816c5934e4c12a865fdab4994ea286c01009d':
docs: December 2014 Dashboard update
Jeff Sharkey [Mon, 1 Dec 2014 18:57:02 +0000 (18:57 +0000)]
Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
Jeff Sharkey [Mon, 1 Dec 2014 18:56:55 +0000 (18:56 +0000)]
Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
Joe Fernandez [Mon, 1 Dec 2014 18:51:54 +0000 (18:51 +0000)]
am
1f5acf84: docs: December 2014 Dashboard update
* commit '
1f5acf84800f58607e5e9f36c48e3b53f10c1163':
docs: December 2014 Dashboard update
Joe Fernandez [Mon, 1 Dec 2014 18:25:01 +0000 (10:25 -0800)]
docs: December 2014 Dashboard update
Change-Id: I80e2477d02ef5eb0964ae6e68ffa11d703db4fe5
Jason Monk [Mon, 1 Dec 2014 18:38:19 +0000 (18:38 +0000)]
am
03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
* commit '
03d705abd60dcd918ae7dcce4c9c48299c1c4995':
SysUI: QS Wifi get connected wifi rssi from NC
Amith Yamasani [Mon, 1 Dec 2014 18:38:14 +0000 (18:38 +0000)]
am
731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
* commit '
731a5c1a29e5bdbf6e7e4bade9b80f7abe6ec37e':
Fix parsing bug that affects reading back guest restrictions
Jason Monk [Mon, 1 Dec 2014 18:33:37 +0000 (18:33 +0000)]
Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
Amith Yamasani [Mon, 1 Dec 2014 18:32:10 +0000 (18:32 +0000)]
Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
smain@google.com [Mon, 1 Dec 2014 18:08:58 +0000 (18:08 +0000)]
am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
7512a46e7e9dfcd6e522e8229b91a63b9e9189de':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 18:04:39 +0000 (18:04 +0000)]
am
fdff66ee: change Trulia context image
* commit '
fdff66ee030869f0f5cb3d1614d66f7d087e2008':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 17:40:42 +0000 (09:40 -0800)]
change Trulia context image
Change-Id: I99e43b358af518750cf7ddae4856bb8ee42729f5
OSDN Git Service
