Commits · 9647aed8b32e0d3b7bc8bfa585b279dec86b1677 · Farzin Kazemzadeh / platform_frameworks_base-old

Jul 27, 2016
- Import translations. DO NOT MERGE · 9647aed8
  Bill Yi authored 8 years ago
  
  am: cdd4f84e -s ours Change-Id: I6e14618caf9ce565b28148fe75827416fc1894cc
  9647aed8
- Import translations. DO NOT MERGE · cdd4f84e
  Bill Yi authored 8 years ago
  
  Change-Id: Id7ec746499ef9a1309384e04bdb556d1616b8c11 Auto-generated-cl: translation import
  cdd4f84e
- api: destroy() and isDestroyed() methods are now default in Destroyable · ea917e52
  Sergio Giro authored 8 years ago
  
  am: 8261d1e0 Change-Id: I0f377bfb1f091e642091859fbb045ccfe63ba0e5
  ea917e52
- api: destroy() and isDestroyed() methods are now default in Destroyable · 8261d1e0
  Sergio Giro authored 8 years ago
  
  Change-Id: Ia5afcec8b627794bba7c69ca6245330b60aef5e9 Test: make droid docs and check-ojluni-files Bug: 29631070
  8261d1e0
- Merge \\"api: destroy() and isDestroyed() methods are now default in Destroyable\\" am: 877d6e75 · 9ab5255e
  Sergio Giro authored 8 years ago
  
  am: 91e11c95 Change-Id: Ib7472ea12d6c59ec6ca36d0c17d63ab5d5193b77
  9ab5255e
- Merge \"api: destroy() and isDestroyed() methods are now default in Destroyable\" · 91e11c95
  Sergio Giro authored 8 years ago
  
  am: 877d6e75 Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
  91e11c95
- Merge "api: destroy() and isDestroyed() methods are now default in Destroyable" · 877d6e75
  Sergio Giro authored 8 years ago
  
  877d6e75
- Merge "Fix thread priority after boosting." into nyc-dev-plus-aosp · ab11a7dd
  Alan Leung authored 8 years ago
  
  ab11a7dd
- docs: updates to Buildilng Your First App doc am: ae47d9d4 · 9efcf16b
  Mark Lu authored 8 years ago
  
  am: 3977f835 Change-Id: Iea59ad167957f314adc09d90f734e1cd123577e4
  9efcf16b
- docs: updates to Buildilng Your First App doc · 3977f835
  Mark Lu authored 8 years ago
  
  am: ae47d9d4 Change-Id: I7b3665dc0f304dcae06939a56c2423d9b269420c
  3977f835
- docs: updates to Buildilng Your First App doc · ae47d9d4
  Mark Lu authored 8 years ago
  
  This commit includes the following updates: - replaces Basic activity with Empty activity - uses default values wherever possible - removes instructions for floating button - removes SDK instructions. Users must use Android Studio - updates the SDK version to API 15 - combines some instructions that were too text heavy Bug: 29766869 Bug: 29768686 Bug: 19154557 Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a (cherry picked from commit 08d1bff7)
  ae47d9d4
Jul 26, 2016
- docs: Migrated \"Network Security Configuration\" page on DAC (N OTA). · 6d346985
  Kevin Hufnagle authored 8 years ago
  
  am: 78747a11 Change-Id: If1ba3b821a6ccb368c6c61212d44ccfd04d8e7ef
  6d346985
- docs: Migrated "Network Security Configuration" page on DAC (N OTA). · 78747a11
  Kevin Hufnagle authored 8 years ago
  
  This page now resides with other pages discussing Android security topics. Bug: 27502850 Change-Id: I8ce3412198527a947e47e421b94c3d15cce6ec48
  78747a11
- Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev · 5fc82562
  Kevin Hufnagle authored 8 years ago
  
  am: 6e4d765f Change-Id: I1107bc377d35c8bb63a2b90118c17940105cddaf
  5fc82562
- docs: Migrated \"key attestation\" page to a new location (for N OTA). · acb6f631
  Kevin Hufnagle authored 8 years ago
  
  am: c946f9d1 Change-Id: I86c74144ab6530c566550b71855f02e09840d7fe
  acb6f631
- Merge "docs: Migrated "key attestation" page to a new location (for N OTA)." into nyc-dev · 6e4d765f
  Kevin Hufnagle authored 8 years ago
  
  6e4d765f
- Merge \\"Fix memory leak in MediaScannerConnection\\" am: e40ab185 · fd743b4d
  Marco Nelissen authored 8 years ago
  
  am: 0d5bcda1 Change-Id: I5714252c0373db0fc85bf65df7b52c983fbc6171
  fd743b4d
- Merge \"Fix memory leak in MediaScannerConnection\" · 0d5bcda1
  xiaoli.xb.zuo authored 8 years ago
  
  am: e40ab185 Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
  0d5bcda1
- Merge "Fix memory leak in MediaScannerConnection" · e40ab185
  Marco Nelissen authored 8 years ago
  
  e40ab185
Jul 25, 2016

Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev · 041ac3d5
Mark Lu authored 8 years ago
```
am: d579d713

Change-Id: Id58dd0692053ddbf41a93d6f2e45d78c4ef50df5
```
041ac3d5
docs: updates to Buildilng Your First App doc · 04fb0c32
Mark Lu authored 8 years ago
```
am: 08d1bff7

Change-Id: I66aa204bf8618ab5af8613fac350d511b3f0486b
```
04fb0c32
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev · b653777a
Elliot Waite authored 8 years ago
```
am: fc0bc7bf

Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e
```
b653777a

docs: Migrated "key attestation" page to a new location (for N OTA). · c946f9d1

Kevin Hufnagle authored 8 years ago

Updated page location, TOC entry, and URL redirect in preparation
for Android Nougat OTA release.

Bug: 28851641
Change-Id: I8be252d79b0b5ad3c7d814175e6bfbfb98e95daf

c946f9d1

resolve merge conflicts of c4ae7827 to nyc-dev-plus-aosp · 66641f8e
Dirk Dougherty authored 8 years ago
```
Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3
```
66641f8e
Merge "docs: updates to Buildilng Your First App doc" into nyc-dev · d579d713
TreeHugger Robot authored 8 years ago

d579d713

docs: updates to Buildilng Your First App doc · 08d1bff7

Mark Lu authored 8 years ago

This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy

Bug: 29766869
Bug: 29768686
Bug: 19154557

Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a

08d1bff7

Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev · fc0bc7bf
Dirk Dougherty authored 8 years ago

fc0bc7bf

Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android... · 0837e3ee

Kevin Hufnagle authored 8 years ago

Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f am: 260e77f6\" into nyc-dev
am: 30588da7

Change-Id: I1b3bbeab2964c0712d59abab76f43d0d13ddb7d6

0837e3ee

Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest... · 39c3cf69

Kevin Hufnagle authored 8 years ago

Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f am: 260e77f6
am: 616ba9d2

Change-Id: I43d14c18de0fd9f5168e5a1350713e36515dedcc

39c3cf69

Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.... · ed0eb357

Kevin Hufnagle authored 8 years ago

Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf3 am: e059c154\" into nyc-dev
am: aa572951

Change-Id: I844fe4bdfd6fef705ce0450ae71a8a9fa1c76ee0

ed0eb357

docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:... · bb09bc18

Kevin Hufnagle authored 8 years ago

docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf3 am: e059c154
am: 15865b5c

Change-Id: I7a4149cae91c3564c6c6fa88c2cfa1d7bad2fe30

bb09bc18

Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest... · 904359a7

Kevin Hufnagle authored 8 years ago

Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f am: c5955764
am: 29df77dd

Change-Id: I219ea7001581bdd0eb1fa3e6cfd7f3a7bda63ed3

904359a7

docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:... · 0ae0f404

Kevin Hufnagle authored 8 years ago

docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf3 am: 22be9b1a
am: b65288fc

Change-Id: I34605fa43f1c4ddd26baa7f4d06760cdb602d41e

0ae0f404

Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android... · 30588da7

Android Build Merger (Role) authored 8 years ago

Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f am: 260e77f6" into nyc-dev

30588da7

Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc.... · aa572951
Android Build Merger (Role) authored 8 years ago
```
Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf3 am: e059c154" into nyc-dev
```
aa572951

Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest... · 616ba9d2

Kevin Hufnagle authored 8 years ago

Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f
am: 260e77f6

Change-Id: Id931a4e007b696368cb7a074e3dcc11d6ac896eb

616ba9d2

docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf3 · 15865b5c
Kevin Hufnagle authored 8 years ago
```
am: e059c154

Change-Id: Ic42a2ab9c49b3c40b5743f095d17be90a3414ad9
```
15865b5c

Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest... · 29df77dd

Kevin Hufnagle authored 8 years ago

Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f
am: c5955764

Change-Id: Icfd32ab1899fd098a9afc3532f8c29accf17b56d

29df77dd

docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf3 · b65288fc
Kevin Hufnagle authored 8 years ago
```
am: 22be9b1a

Change-Id: Ie27aa01933ac6f8854efb626d8bb776af6d1cf7d
```
b65288fc
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs · c5955764
Kevin Hufnagle authored 8 years ago
```
am: c46ee88f

Change-Id: I4197d61f056148f06978c2471b2b1ebf25b37881
```
c5955764