Commits · 2f2365de4a339d37af00055556d6d643175453b8 · Farzin Kazemzadeh / platform_frameworks_base-old

Sep 21, 2016
- add source.properties file to the offline docs build · 2f2365de
  smain@google.com authored 8 years ago
  
  which is required to get this in the SDK Manager Change-Id: If53cdedcb8f5910fe37add44168348c9fd14d0cb
  2f2365de
Sep 20, 2016

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev... · 011172a7

Sudheer Shanka authored 8 years ago

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274 am: 96d70301 am: 018d1e7e
am: fc2bef01 -s ours

Change-Id: Ie957e5ca85ad212891574b0a5a932fde4c565ede

011172a7

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e7361 am: 2f44f906 am: f4844b34 · 7f99a18e
Sudheer Shanka authored 8 years ago
```
am: 6f170618  -s ours

Change-Id: I862c56f9db4ac9161dc155dc9f469909e30b0c61
```
7f99a18e

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev... · fc2bef01

Sudheer Shanka authored 8 years ago

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274 am: 96d70301
am: 018d1e7e

Change-Id: Ide3eaf333a2a1e3ef60ec0fb6e9ead1a0517c327

fc2bef01

Sep 19, 2016

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e7361 am: 2f44f906 · 6f170618
Sudheer Shanka authored 8 years ago
```
am: f4844b34

Change-Id: Ic9c96ac3d030ebb0ac53a48686b541a0182795cb
```
6f170618
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274 · 018d1e7e
Sudheer Shanka authored 8 years ago
```
am: 96d70301

Change-Id: I9ec98a60d61bbafd25be9d85f31b3086cef59779
```
018d1e7e
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app... · c60146d8
Kevin Hufnagle authored 8 years ago
```
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
```
c60146d8
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e7361 · f4844b34
Sudheer Shanka authored 8 years ago
```
am: 2f44f906

Change-Id: I389ab319b133296296f3e7fe6aa44b9f208748bd
```
f4844b34
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev · 96d70301
Sudheer Shanka authored 8 years ago
```
am: 38077274

Change-Id: I10b7e25858e63110a63b4e92742c1305f0e9eed0
```
96d70301
DO NOT MERGE: Fix deadlock in AcitivityManagerService. · 2f44f906
Sudheer Shanka authored 8 years ago
```
am: b59e7361

Change-Id: Ibb2cba35ebedc884247c189a214ccce396333342
```
2f44f906
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev · 38077274
Sudheer Shanka authored 8 years ago

38077274
Merge "Fix deadlock in AcitivityManagerService." into nyc-dev · e70ebd69
Sudheer Shanka authored 8 years ago

e70ebd69
Merge "docs: Fixed language directory issue localization" into nyc-dev · 52fd8f88
Eric Schmidt authored 8 years ago

52fd8f88
docs: Added descriptions of "Pricing Template ID" column to in-app · 49ed3eb8
Kevin Hufnagle authored 8 years ago
```
products CSV guide

Bug: 31507720
Change-Id: Ic95bd1dab5d1fb75a6dbab9dba5f0f8195f4090e
```
49ed3eb8
update DAC landings for Studio 2.2 · f032cbfa
smain@google.com authored 8 years ago
```
Change-Id: I5ab5cb935ca058b543bd5751c3cdcc7cbf92a1dd
```
f032cbfa

Fix build break due to automerge of am: am: am:... · 8279621b

Paul Jensen authored 8 years ago

Fix build break due to automerge of 7d2198b5 am: baae57ab am: 009e0811 am: d6a5f68f am: a81dd677 am: ad004292 am: cc3287ef
am: f8d3ded0

Change-Id: Id7ca0a8a930e3abfd7edd3a5f192ca478de51a34

8279621b

Fix build break due to automerge of am: am: am:... · f8d3ded0

Paul Jensen authored 8 years ago

Fix build break due to automerge of 7d2198b5 am: baae57ab am: 009e0811 am: d6a5f68f am: a81dd677 am: ad004292
am: cc3287ef

Change-Id: Ie67919fe79a9102b7bb5b0dd10f66816fdf03e81

f8d3ded0

Fix build break due to automerge of am: am: am:... · cc3287ef

Paul Jensen authored 8 years ago

Fix build break due to automerge of 7d2198b5 am: baae57ab am: 009e0811 am: d6a5f68f am: a81dd677
am: ad004292

Change-Id: I3c5ac16e2a7cad533c7d8c8b0e611bd26743e875

cc3287ef

Fix build break due to automerge of 7d2198b5 am: baae57ab am: 009e0811 am: d6a5f68f · ad004292
Paul Jensen authored 8 years ago
```
am: a81dd677

Change-Id: Id2da47a2300b6fd211da08daddc1873bdc519e14
```
ad004292
Fix build break due to automerge of 7d2198b5 am: baae57ab am: 009e0811 · a81dd677
Paul Jensen authored 8 years ago
```
am: d6a5f68f

Change-Id: I55e5c90dd0b2c52a1cbee5d6be14a339157d6a75
```
a81dd677
Fix build break due to automerge of 7d2198b5 am: baae57ab · d6a5f68f
Paul Jensen authored 8 years ago
```
am: 009e0811

Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80
```
d6a5f68f
Fix build break due to automerge of 7d2198b5 · 009e0811
Paul Jensen authored 8 years ago
```
am: baae57ab

Change-Id: Iafcc207308b94d37a04d196def0e7c7a5ce037d9
```
009e0811
Fix build break due to automerge of 7d2198b5 · baae57ab
Paul Jensen authored 8 years ago
```
Bug: 30100884

Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
```
baae57ab

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · 410b6d68

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5 am: 963ca6f9 am: 3532f10f am: 849f1ba2 am: b7ba9fd7 am: 4121b70a am: c875015c am: 66482b55 am: bedb9475
am: a728ecff

Change-Id: I8c4049d8baa06c1f83e450454f6d98626019b0f5

410b6d68

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · c2069232

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a am: 66ee2296 am: d37eb764 am: ddce8664 am: 4fd2cc72 am: 2855de1e am: 53a9c65c am: 34e77bb6
am: d3a9c090

Change-Id: If0af355f2163cae5fd2f76c4458bda8a92149beb

c2069232

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · a728ecff

Paul Jensen authored 8 years ago

Change-Id: I32f3d45fd9c0b1969ca0c566eaed97e006cc7aea

a728ecff

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · d3a9c090

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a am: 66ee2296 am: d37eb764 am: ddce8664 am: 4fd2cc72 am: 2855de1e am: 53a9c65c
am: 34e77bb6

Change-Id: I205e3c3fe88b28525cd2ec06830dcc9e40b453bb

d3a9c090

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · bedb9475

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5 am: 963ca6f9 am: 3532f10f am: 849f1ba2 am: b7ba9fd7 am: 4121b70a am: c875015c
am: 66482b55

Change-Id: I56c9c0235ef6a77764f5d4fc8a77afd7bd34d35b

bedb9475

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · 34e77bb6

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a am: 66ee2296 am: d37eb764 am: ddce8664 am: 4fd2cc72 am: 2855de1e
am: 53a9c65c

Change-Id: Ib5ce70593ec69419bc3ed839ce8cc77b52a32120

34e77bb6

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · 66482b55

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5 am: 963ca6f9 am: 3532f10f am: 849f1ba2 am: b7ba9fd7 am: 4121b70a
am: c875015c

Change-Id: Ic04dd9fcf708873b95113814eeba18501861a32a

66482b55

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · 53a9c65c

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a am: 66ee2296 am: d37eb764 am: ddce8664 am: 4fd2cc72
am: 2855de1e

Change-Id: I67e399dc97073387b2c0c6769bf9b4b19cb91a62

53a9c65c

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · c875015c

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5 am: 963ca6f9 am: 3532f10f am: 849f1ba2 am: b7ba9fd7
am: 4121b70a

Change-Id: I225d23b2ad0afa6113c085d2ee7e51c996896902

c875015c

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · 4121b70a

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5 am: 963ca6f9 am: 3532f10f am: 849f1ba2
am: b7ba9fd7

Change-Id: If57722c1437bd5ea7b3a1fd016cbc7fce8237965

4121b70a

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · 2855de1e

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a am: 66ee2296 am: d37eb764 am: ddce8664
am: 4fd2cc72

Change-Id: I2bd78344796e888c4fa26dcf2e07a0a24994cb42

2855de1e

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · 4fd2cc72

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a am: 66ee2296 am: d37eb764
am: ddce8664

Change-Id: I9379db3398f066841fdb5435d8128e2d12bff63b

4fd2cc72

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · b7ba9fd7

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5 am: 963ca6f9 am: 3532f10f
am: 849f1ba2

Change-Id: I3213d64cc5396a22096e3ad484a3f769f03f6cda

b7ba9fd7

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · ddce8664

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a am: 66ee2296
am: d37eb764

Change-Id: I2433d723fd9ec13774eff4aa40a089e73932f357

ddce8664

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · 849f1ba2

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5 am: 963ca6f9
am: 3532f10f

Change-Id: I9dc833de510da32d47c4e6b0a78eae4cc7a38832

849f1ba2

Avoid crashing when downloading MitM'd PAC that is too big am: am:... · d37eb764

Paul Jensen authored 8 years ago

Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b5 am: 9c1cb7a2 am: 6634e90a
am: 66ee2296

Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492

d37eb764

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into... · 3532f10f

Paul Jensen authored 8 years ago

Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5
am: 963ca6f9

Change-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df

3532f10f