Etan Cohen
cd811f0cf0
Convert useImsAlwaysForEmergencyCall to carrier configuration.
...
Change-Id: Id29ab106f01722ecd1f48590c32f899becd06d5f
2015-08-18 11:11:29 -07:00
Alan Viverette
d920ac6e6f
Merge "Use correct param for heightMode in RelativeLayout horizontal measure"
2015-08-18 13:28:44 +00:00
Sebastien Hertz
5fa6c7424a
am 60a2716f: am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit '60a2716f720e843a7de6e7209c2021d95538711e':
Allow debugging only for apps forked from zygote
2015-08-18 09:59:11 +00:00
Sebastien Hertz
60a2716f72
am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit '3244dc229af4d4c8b764bf9ca1e108b5cd933d90':
Allow debugging only for apps forked from zygote
2015-08-18 09:52:46 +00:00
Sebastien Hertz
3244dc229a
am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit '677cd0872013cdeb4c201ce0994633065b616725':
Allow debugging only for apps forked from zygote
2015-08-18 08:04:41 +00:00
Sebastien Hertz
677cd08720
am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit 'e9de1b4cef10922180cfe06049cf906160e2c315':
Allow debugging only for apps forked from zygote
2015-08-18 07:56:37 +00:00
Joe Fernandez
44a96f893a
am 069b3c19: am 9b56bff4: am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit '069b3c19972ebed77ff65593ba3c858641d852e2':
docs: App link doc update for M Preview 3
2015-08-18 07:54:25 +00:00
Sebastien Hertz
e9de1b4cef
am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
...
* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
Allow debugging only for apps forked from zygote
2015-08-18 07:50:06 +00:00
Joe Fernandez
069b3c1997
am 9b56bff4: am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit '9b56bff4a9e849689f6441b50ea7c3f5b9910f43':
docs: App link doc update for M Preview 3
2015-08-18 07:48:52 +00:00
Sebastien Hertz
9a010d0a41
Merge "Allow debugging only for apps forked from zygote" into mnc-dev
2015-08-18 07:41:50 +00:00
Joe Fernandez
9b56bff4a9
am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit '20a9ca1581c266ce320ea850ee6dc10719584ebf':
docs: App link doc update for M Preview 3
2015-08-18 07:41:22 +00:00
Joe Fernandez
20a9ca1581
am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit 'd294dc437d53ceb74529e62aa70078a8f51bb462':
docs: App link doc update for M Preview 3
2015-08-18 07:36:25 +00:00
Joe Fernandez
d294dc437d
am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
...
* commit '96695d2f5961cbfac2d5c5ea6a7c03612991d5fb':
docs: App link doc update for M Preview 3
2015-08-18 07:28:31 +00:00
Joe Fernandez
96695d2f59
Merge "docs: App link doc update for M Preview 3" into mnc-dev
2015-08-18 07:23:35 +00:00
Joe Fernandez
94fc625cf1
docs: App link doc update for M Preview 3
...
Change-Id: I9a8843bb2209f9ac12d5d0946dda1e3bdd6f1947
2015-08-18 00:14:14 -07:00
David Friedman
8bbb2de27a
am 41f78a40: am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit '41f78a408f5ad413ed553d2c45e5d46aca89ee56':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 05:21:47 +00:00
David Friedman
41f78a408f
am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit '878acada08c49214b720fdd57b8150407a4e223f':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 05:14:12 +00:00
David Friedman
878acada08
am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit 'd7792759e703200c833736df276915958588cad4':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 05:07:15 +00:00
David Friedman
d7792759e7
am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit '5f89ce649c6385bd6463641c5408cc7a274b0eb6':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 05:00:50 +00:00
David Friedman
5f89ce649c
am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
...
* commit '3e40a27eaca9e82398f7dc59006c14e56de7cc43':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
2015-08-18 04:54:58 +00:00
David Friedman
3e40a27eac
Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev
2015-08-18 04:50:23 +00:00
Filip Gruszczynski
5731754954
am e1e9e811: am d29dd0c9: am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit 'e1e9e811ab06a85a6494bebca0f530c8f0ed7268':
Clear old clip rect when creating new surface.
2015-08-18 02:38:03 +00:00
Filip Gruszczynski
e1e9e811ab
am d29dd0c9: am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit 'd29dd0c98633e274499ec4177e48a62644175912':
Clear old clip rect when creating new surface.
2015-08-18 02:31:05 +00:00
Filip Gruszczynski
d29dd0c986
am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit 'b59404a1f590091f0c3cd22b69de1b55154ef580':
Clear old clip rect when creating new surface.
2015-08-18 02:25:00 +00:00
Filip Gruszczynski
b59404a1f5
am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit 'eb2f302d119faaaf5d63f23f0921da9d756da5b4':
Clear old clip rect when creating new surface.
2015-08-18 02:19:51 +00:00
Filip Gruszczynski
eb2f302d11
am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
...
* commit '610008c0ebf5ea4556b4825eac521b2b16f1a66c':
Clear old clip rect when creating new surface.
2015-08-18 02:12:47 +00:00
Filip Gruszczynski
610008c0eb
Merge "Clear old clip rect when creating new surface." into mnc-dev
2015-08-18 02:04:57 +00:00
Dianne Hackborn
fc58dff0dd
am ea4133b4: am cfd288b8: am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
...
* commit 'ea4133b4c4c40f8803f1ca7e12a5eb70f8e29534':
Fix issue #23214751 : Get a GPS fix before going in to doze
2015-08-18 01:56:22 +00:00
Dianne Hackborn
ea4133b4c4
am cfd288b8: am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
...
* commit 'cfd288b8581fa4170afefaa0ea146279d5df87ac':
Fix issue #23214751 : Get a GPS fix before going in to doze
2015-08-18 01:49:22 +00:00
David Friedman
eaabddf121
Docs: Fixing files that didn't merge properly from mnc-preview-docs
...
Change-Id: If1a97d8da5a8e7f65293bc34e1a1646f06a48043
2015-08-17 18:45:36 -07:00
Chris Tate
1c1dd4bc8d
am 45f88e1b: am 591b371f: am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
...
* commit '45f88e1b2c0a8433b073f69c58660db843d46d04':
Clean up properly if outcall for doRestoreFinished() fails
2015-08-18 01:44:08 +00:00
Dianne Hackborn
cfd288b858
am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
...
* commit '5211c0630bc5ab3026dd29e1640ddc83590e3219':
Fix issue #23214751 : Get a GPS fix before going in to doze
2015-08-18 01:41:45 +00:00
Chris Tate
45f88e1b2c
am 591b371f: am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
...
* commit '591b371fbb07cb4db5cd556aa6b52936557e8382':
Clean up properly if outcall for doRestoreFinished() fails
2015-08-18 01:36:05 +00:00
Dianne Hackborn
5211c0630b
am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
...
* commit '6da89844d422477c0f90f3b97f96c64f3bccb3fb':
Fix issue #23214751 : Get a GPS fix before going in to doze
2015-08-18 01:35:14 +00:00
Chris Tate
591b371fbb
am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
...
* commit 'ccbb02f9b91a2fe631487c5644996c7dde567950':
Clean up properly if outcall for doRestoreFinished() fails
2015-08-18 01:28:13 +00:00
Dianne Hackborn
6da89844d4
am 12b9c2d6: Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
...
* commit '12b9c2d6aa77d25848f81d84e34367a46d09d2af':
Fix issue #23214751 : Get a GPS fix before going in to doze
2015-08-18 01:26:10 +00:00
Chris Tate
ccbb02f9b9
am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
...
* commit 'b16cd62c676dc219c0f31495ad13aeb0381fee0e':
Clean up properly if outcall for doRestoreFinished() fails
2015-08-18 01:21:05 +00:00
Dianne Hackborn
12b9c2d6aa
Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
2015-08-18 01:17:00 +00:00
Chris Tate
b16cd62c67
am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
...
* commit 'c0a2254e083f7d2f38052012363cd71d1a6657dc':
Clean up properly if outcall for doRestoreFinished() fails
2015-08-18 01:13:24 +00:00
Chris Tate
c0a2254e08
Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
2015-08-18 01:07:50 +00:00
Filip Gruszczynski
3fcb5d66e4
Clear old clip rect when creating new surface.
...
This fixes an issue where a window state animator holds on to old clip
rect from previous transition and applies it to the newly created surface.
Bug: 22851074
Change-Id: Ic416a2a0c5d0f69fc80d5656541256ade41c9c36
2015-08-17 17:52:24 -07:00
Quddus Chong
267ed78aad
am 96395fad: am 338b0556: am 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
...
* commit '96395fad84a7f6dba2124a1d68e5c63cb4e0e1de':
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-18 00:24:39 +00:00
Joe Fernandez
b34086aab7
am 91b44d93: am 33c9093e: am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
...
* commit '91b44d933371037a7d7c607797bb12b5f00b9fcc':
docs: M Preview 3 post-release cleanup
2015-08-18 00:16:46 +00:00
Quddus Chong
96395fad84
am 338b0556: am 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
...
* commit '338b05560de148096ab6a92deb11ab908686b42f':
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-18 00:15:33 +00:00
Amit Mahajan
89967e2eb4
am 6afd2641: am 13bf77ed: am d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev
...
* commit '6afd26412701dc510439d1d67f0843ce6ba4cea5':
Setting config_use_sim_language_file to false for 334-020.
2015-08-18 00:11:34 +00:00
Joe Fernandez
91b44d9333
am 33c9093e: am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
...
* commit '33c9093e13c85e95f8a86d8bcfd6033c3e506aea':
docs: M Preview 3 post-release cleanup
2015-08-18 00:08:28 +00:00
Quddus Chong
338b05560d
am 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
...
* commit '905af2b46285a66b4921a39f324465b727fe00bd':
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-18 00:06:52 +00:00
Amit Mahajan
6afd264127
am 13bf77ed: am d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev
...
* commit '13bf77ed0a96a286b4503b6f30ba8dcef943d27d':
Setting config_use_sim_language_file to false for 334-020.
2015-08-18 00:02:03 +00:00
Joe Fernandez
33c9093e13
am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
...
* commit 'a215557b73b1edf8224609088b3c231b44a5fe6f':
docs: M Preview 3 post-release cleanup
2015-08-18 00:00:04 +00:00
Quddus Chong
905af2b462
am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
...
* commit '0c61fe7606c8af2a89abebde0c174e88b950a8b8':
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-17 23:54:34 +00:00
