Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,385 Commits 3 Branches 0 Tags
47e1e14589cb62de65332ee467e845efc3e43d55
Commit Graph

254385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
aee0eac190 docs: fix resource card listings for DoDS in Wear Preview am: e6c2b75650 am: 4acf490c8a 
am: edcf61d7f8

* commit 'edcf61d7f8b724650c04116664dc53a03a6b3970':
  docs: fix resource card listings for DoDS in Wear Preview

Change-Id: I816bb5c2eae614d603fe6be91a57f36942b320d5
 2016-05-15 22:30:25 +00:00
Joe Fernandez
73e912363f docs: fix resource card listings for DoDS in Wear Preview am: e6c2b75650 am: 4acf490c8a 
am: edcf61d7f8

* commit 'edcf61d7f8b724650c04116664dc53a03a6b3970':
  docs: fix resource card listings for DoDS in Wear Preview

Change-Id: I808e71a3511649d2792303aecef0b82c2d4a3c86
 2016-05-15 22:30:23 +00:00
Joe Fernandez
edcf61d7f8 docs: fix resource card listings for DoDS in Wear Preview am: e6c2b75650 
am: 4acf490c8a

* commit '4acf490c8aa80f1c55a0d2dfdd69fbbcf59f23de':
  docs: fix resource card listings for DoDS in Wear Preview

Change-Id: Ie865c0f17d25063983a88314c3a41a3c148638db
 2016-05-15 22:27:07 +00:00
Joe Fernandez
4acf490c8a docs: fix resource card listings for DoDS in Wear Preview 
am: e6c2b75650

* commit 'e6c2b75650749d79dca4e50cb9214ee75d8472b8':
  docs: fix resource card listings for DoDS in Wear Preview

Change-Id: Iaf271f90ad931c042dc0b81a55f5651af644012f
 2016-05-15 22:24:18 +00:00
Joe Fernandez
e6c2b75650 docs: fix resource card listings for DoDS in Wear Preview 
b/28769830

Change-Id: I69eb12de0779f7a63e35d50e0f8fa767475ef1e6
 2016-05-15 15:11:08 -07:00
Android Build Merger (Role)
51644036c1 Merge "Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc am: 21f1a6d8e1 am: 0eceb79963 am: 5f98032ddd" into nyc-mr1-dev-plus-aosp 2016-05-15 19:58:16 +00:00
Dirk Dougherty
6b92345341 Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc am: 21f1a6d8e1 am: 0eceb79963 
am: 5f98032ddd

* commit '5f98032ddd1f45f59b0adf4610177bd1c8aef806':

Change-Id: Ia78a72841e44d3eb20d4561bf444bfd050cb0470
 2016-05-15 19:57:54 +00:00
Android Build Merger (Role)
03050f690d Merge "Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc am: 21f1a6d8e1 am: 0eceb79963 am: 5f98032ddd" into nyc-mr1-dev-plus-aosp 2016-05-15 19:55:38 +00:00
Dirk Dougherty
de59426ae2 Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc am: 21f1a6d8e1 am: 0eceb79963 
am: 5f98032ddd

* commit '5f98032ddd1f45f59b0adf4610177bd1c8aef806':
  fix typo in book path for devsite builds.

Change-Id: I910484f5b172c4eeee50bacea78e4c61b71767c2
 2016-05-15 19:55:06 +00:00
Dirk Dougherty
c7dee4d505 Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc am: 21f1a6d8e1 am: 0eceb79963 
am: 89613588a2

* commit '89613588a23c90cd60fbf92a3458c03f10b8161d':
  fix typo in book path for devsite builds.

Change-Id: I657256a0b2537bbdb2f268683b866a282ce144dd
 2016-05-15 19:55:04 +00:00
Dirk Dougherty
89613588a2 Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc am: 21f1a6d8e1 
am: 0eceb79963

* commit '0eceb79963917ca4295026b6a046389efbb7bca0':
  fix typo in book path for devsite builds.

Change-Id: Icc484fd3ed54dd70e783dacf9f52ef630b7b6d9c
 2016-05-15 19:52:18 +00:00
Dirk Dougherty
5f98032ddd Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc am: 21f1a6d8e1 
am: 0eceb79963

* commit '0eceb79963917ca4295026b6a046389efbb7bca0':
  fix typo in book path for devsite builds.

Change-Id: Ifb1a95022614f0fcee0b35cf96a01838a2d0f641
 2016-05-15 19:52:14 +00:00
Dirk Dougherty
0eceb79963 Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 am: 2394b301fc 
am: 21f1a6d8e1

* commit '21f1a6d8e106d6a0fc5ccda15f93f4319b3142e1':
  fix typo in book path for devsite builds.

Change-Id: I659cb1e894b0d8156817de3264a922c5f81579d3
 2016-05-15 19:48:54 +00:00
Dirk Dougherty
21f1a6d8e1 Merge "fix typo in book path for devsite builds." into mnc-mr-docs am: 44b31fa0c4 
am: 2394b301fc

* commit '2394b301fc792bd5911cbfab585061b32a8cd7f3':
  fix typo in book path for devsite builds.

Change-Id: I83499e76960f7d507345f2374ba4adab94c4fa02
 2016-05-15 19:45:45 +00:00
Dirk Dougherty
2394b301fc Merge "fix typo in book path for devsite builds." into mnc-mr-docs 
am: 44b31fa0c4

* commit '44b31fa0c42e0d52f0cecbc1f75a0e62279ff5c1':
  fix typo in book path for devsite builds.

Change-Id: I30c2abc4be350c6c78c0372a54459b21fb1fd132
 2016-05-15 19:43:01 +00:00
Dirk Dougherty
44b31fa0c4 Merge "fix typo in book path for devsite builds." into mnc-mr-docs 2016-05-15 19:38:52 +00:00
smain@google.com
825fe72042 Delete outdated sitemap file. 
Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: If6f8d34532e1b695fbfaf49173df8cb7648ee267
 2016-05-15 02:13:25 -07:00
smain@google.com
075b23529c Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1 am: 6c568e6322 am: e9746f7a6a 
am: b09066c4cb

* commit 'b09066c4cb9024e9081859460fd9c473a328de65':

Change-Id: I70a95c7970a76b80bc505bf893f8ee7aa04a254d
 2016-05-15 03:27:41 +00:00
smain@google.com
a8b591bc2c Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1 am: 6c568e6322 am: e9746f7a6a 
am: ead0d22668

* commit 'ead0d2266836d15a9d7b17d915dcc0d75e2f8145':
  Update links for all files under sdk/ that moved to studio/

Change-Id: Ie5069fbfef517008f5997130706dfe56587f11de
 2016-05-15 03:25:10 +00:00
smain@google.com
b09066c4cb Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1 am: 6c568e6322 
am: e9746f7a6a

* commit 'e9746f7a6a17222162625565db197ae52bce0be6':
  Update links for all files under sdk/ that moved to studio/

Change-Id: Ibb9798a3004a1e6762deaa7d53b7cd2f1cb6c72a
 2016-05-15 03:22:36 +00:00
smain@google.com
ead0d22668 Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1 am: 6c568e6322 
am: e9746f7a6a

* commit 'e9746f7a6a17222162625565db197ae52bce0be6':
  Update links for all files under sdk/ that moved to studio/

Change-Id: Ia38018c1b0901dd6b89efb71e9626447633fee16
 2016-05-15 03:22:33 +00:00
smain@google.com
e9746f7a6a Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1 
am: 6c568e6322

* commit '6c568e632242e99eb255f721edcbec0223f9934d':
  Update links for all files under sdk/ that moved to studio/

Change-Id: I2acd1acd6fef98c527ef4dfc0d016bb5cfa296cc
 2016-05-15 03:11:46 +00:00
smain@google.com
6c568e6322 Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 
am: d10e0132a1

* commit 'd10e0132a124f5a24bec436600e04b8f97720e7e':
  Update links for all files under sdk/ that moved to studio/

Change-Id: If4a364fecbbb012f5b6beb739d879b003f90e6d9
 2016-05-15 03:09:06 +00:00
smain@google.com
d10e0132a1 Update links for all files under sdk/ that moved to studio/ 
am: 89d11705a1

* commit '89d11705a19f73d32a7e604477dd4358dc04d051':
  Update links for all files under sdk/ that moved to studio/

Change-Id: Id47c082a96ffffdfb439aaab80ccb0a645557dec
 2016-05-15 03:06:29 +00:00
smain@google.com
89d11705a1 Update links for all files under sdk/ that moved to studio/ 
Change-Id: I624621dfd7df0f441d0b559e5a12029e5e299964
 2016-05-15 02:55:23 +00:00
Android Build Merger (Role)
f499e578f5 Merge "UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 am: cf3fa15b3e am: c87446f5a8 am: 346ad68911" into nyc-mr1-dev-plus-aosp 2016-05-14 22:08:11 +00:00
sreevanis
c221fc3c80 UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 am: cf3fa15b3e am: c87446f5a8 
am: 346ad68911

* commit '346ad689114d0a5f2d63060abf8c2e1e010e49b6':

Change-Id: Ie00940253b4b2e2b82a42a2f536e9af259bb5970
 2016-05-14 22:07:48 +00:00
Android Build Merger (Role)
16837d1846 Merge "UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 am: cf3fa15b3e am: c87446f5a8 am: 346ad68911" into nyc-mr1-dev-plus-aosp 2016-05-14 22:05:57 +00:00
sreevanis
ca74a2e492 UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 am: cf3fa15b3e am: c87446f5a8 
am: 346ad68911

* commit '346ad689114d0a5f2d63060abf8c2e1e010e49b6':
  UI Widgets documentation for Wear 2.0 preview.

Change-Id: Ib3743f53a355e463f99b6c2cbf114f227f265539
 2016-05-14 22:05:29 +00:00
sreevanis
5a0440917d UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 am: cf3fa15b3e am: c87446f5a8 
am: 8a7b5ca07a

* commit '8a7b5ca07abe768eda13ac2dea5eca08ca44dd57':
  UI Widgets documentation for Wear 2.0 preview.

Change-Id: I23813fee2ae21f794239737469975ab55d5b0d32
 2016-05-14 22:05:27 +00:00
sreevanis
8a7b5ca07a UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 am: cf3fa15b3e 
am: c87446f5a8

* commit 'c87446f5a8c75598bcc79e9400eaaf4839e105c4':
  UI Widgets documentation for Wear 2.0 preview.

Change-Id: I2798b6433215aaf6ee983f8b75ff2f3cd1dc6054
 2016-05-14 22:02:55 +00:00
sreevanis
346ad68911 UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 am: cf3fa15b3e 
am: c87446f5a8

* commit 'c87446f5a8c75598bcc79e9400eaaf4839e105c4':
  UI Widgets documentation for Wear 2.0 preview.

Change-Id: Idb51ded93f6aa4070684c71830cbab3772a5d108
 2016-05-14 22:02:53 +00:00
sreevanis
c87446f5a8 UI Widgets documentation for Wear 2.0 preview. am: 0fce5d1328 
am: cf3fa15b3e

* commit 'cf3fa15b3ea686daeedffb76712f2ec43651a354':
  UI Widgets documentation for Wear 2.0 preview.

Change-Id: Ide6bbe3b5aee7358f35739b9d9c03dd58c32213e
 2016-05-14 22:00:19 +00:00
sreevanis
cf3fa15b3e UI Widgets documentation for Wear 2.0 preview. 
am: 0fce5d1328

* commit '0fce5d13289606087785682b80b7ea6fb9e74293':
  UI Widgets documentation for Wear 2.0 preview.

Change-Id: I1ac2e002139cd6850b941893a9c1f7f2bc710e10
 2016-05-14 21:57:40 +00:00
sreevanis
0fce5d1328 UI Widgets documentation for Wear 2.0 preview. 
Bug:28473253
Change-Id: I983249b301ae2585e2e78f09c532e4a7e7b32df7
 2016-05-14 14:50:43 -07:00
Android Build Merger (Role)
05a206ea08 Merge "Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 am: f9f10cbe36" into nyc-mr1-dev-plus-aosp 2016-05-14 01:41:50 +00:00
Ruchi Kandoi
6c3db04335 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 
am: f9f10cbe36

* commit 'f9f10cbe3622d7b1dc69f9745cdeca83f7235ec7':

Change-Id: I97c5c4680ec74dab6294dd76a0271267e619539c
 2016-05-14 01:41:30 +00:00
Android Build Merger (Role)
7a196311b7 Merge "Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 am: f9f10cbe36" into nyc-mr1-dev-plus-aosp 2016-05-14 01:39:49 +00:00
Ruchi Kandoi
e5c57073c6 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 
am: f9f10cbe36

* commit 'f9f10cbe3622d7b1dc69f9745cdeca83f7235ec7':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I465084b1073b9f7462885b160f5428e232691123
 2016-05-14 01:39:18 +00:00
Ruchi Kandoi
3bba531ee4 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 
am: b60d0a438a

* commit 'b60d0a438a66b78ed0714a0182d6e84426fb0d88':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I6a6957d530bab235b751a93271d1ae711ffa9c01
 2016-05-14 01:39:16 +00:00
Ruchi Kandoi
b60d0a438a Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev 
am: 2512ec9e37

* commit '2512ec9e376b0fce213f6d635dfb991c79041031':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I899110108f1200dbc687732963e85083ec5504e0
 2016-05-14 01:36:48 +00:00
Ruchi Kandoi
f9f10cbe36 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev 
am: 2512ec9e37

* commit '2512ec9e376b0fce213f6d635dfb991c79041031':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I2bb83824d97d426d114f71fdb0b590ce9fd8a12a
 2016-05-14 01:36:45 +00:00
Ruchi Kandoi
2512ec9e37 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev 2016-05-14 01:32:54 +00:00
Daniel Nishi
057a101453 Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev 
am: e8ed2ed331

* commit 'e8ed2ed331a056fe2262ac649f71d781df25f363':
  Add an Activity action to go into the Deletion Helper.

Change-Id: I09b09f645b455c8a2cde7bd0eadb34b2cc704178
 2016-05-14 01:17:24 +00:00
Android Build Merger (Role)
60b75a9420 Merge "Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev am: 73522651e2 am: 6bf8f648fc" into nyc-mr1-dev-plus-aosp 2016-05-14 01:14:58 +00:00
Jae Seo
95ec5ff71b Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev am: 73522651e2 
am: 6bf8f648fc

* commit '6bf8f648fcb758aa5183790b497ce5de843954f1':
  Fix regression from "PIP: Fix NPE when onboarding is shown"

Change-Id: I544e4b3cf81809883d046c36c306dbec429ad58a
 2016-05-14 01:14:40 +00:00
Jae Seo
35e41618c8 Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev am: 73522651e2 
am: cb1b73c84d

* commit 'cb1b73c84d9fc52670aaf27617befd02abbd5c31':
  Fix regression from "PIP: Fix NPE when onboarding is shown"

Change-Id: Ib4db2e0ed4cb21f4632c3b8c0f0d2c7486fd9791
 2016-05-14 01:14:37 +00:00
Daniel Nishi
e8ed2ed331 Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev 2016-05-14 01:14:15 +00:00
Jae Seo
cb1b73c84d Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev 
am: 73522651e2

* commit '73522651e2dd4085bd7f5c568dd9775f3643fb9a':
  Fix regression from "PIP: Fix NPE when onboarding is shown"

Change-Id: Ieaa81a4f0065ea53e8d248d8ce05c0c9c41a6419
 2016-05-14 01:12:12 +00:00
Jae Seo
6bf8f648fc Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev 
am: 73522651e2

* commit '73522651e2dd4085bd7f5c568dd9775f3643fb9a':
  Fix regression from "PIP: Fix NPE when onboarding is shown"

Change-Id: I94ca1670ca5016f0a4f8dd860ac290b528425c2c
 2016-05-14 01:12:10 +00:00