Commit Graph

277484 Commits

Author SHA1 Message Date
Mark Lu
e3be77810d Merge "Docs: Updates to backup documentation" into nyc-dev am: d93a31bbe0
am: 6bd0c689e9

Change-Id: I7b3e73ff2664388e585e59b96d09f184b73c2ba6
2016-09-30 21:57:15 +00:00
Android Build Merger (Role)
200aa0e27b Merge "Docs: Updates to backup documentation am: f0968050f6 am: 233f52d92b" into nyc-mr1-dev-plus-aosp 2016-09-30 21:56:54 +00:00
Mark Lu
8d6ab029b6 Docs: Updates to backup documentation am: f0968050f6
am: 233f52d92b

Change-Id: Ic8c9c6d0ad323abd64321805b2407616a35d6030
2016-09-30 21:56:14 +00:00
David Friedman
69ac5b9426 Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am: a9c3a0b529 am: b25c08fa32 am: f7b37fa056
am: c2553a64e1

Change-Id: I0d72647cf1b119fd5e75330e220f154372383184
2016-09-30 21:56:10 +00:00
Mark Lu
49798d8b15 Docs: Updates to backup documentation am: f0968050f6
am: 0109b0f83a

Change-Id: Ib966eb7e733064344d10c2c70ee97e995edb7a5d
2016-09-30 21:56:06 +00:00
Mark Lu
6bd0c689e9 Merge "Docs: Updates to backup documentation" into nyc-dev
am: d93a31bbe0

Change-Id: I852b6a74f0be30a063c30bdb82553ba80f2717fe
2016-09-30 21:49:28 +00:00
Mark Lu
0109b0f83a Docs: Updates to backup documentation
am: f0968050f6

Change-Id: I6364318aca4e56dc72a049d20b5cab99190d7ed4
2016-09-30 21:49:23 +00:00
Mark Lu
ddc523b5b3 Merge "Docs: Updates to backup documentation" into nyc-dev
am: d93a31bbe0

Change-Id: I3943558e87f27c3bb0db9cc9ccb08e16d52811f4
2016-09-30 21:49:16 +00:00
Mark Lu
233f52d92b Docs: Updates to backup documentation
am: f0968050f6

Change-Id: Ib4c23d6c78958f0d35ee313b341c8da7513e574a
2016-09-30 21:49:11 +00:00
David Friedman
c2553a64e1 Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am: a9c3a0b529 am: b25c08fa32
am: f7b37fa056

Change-Id: If60db9344db3bb16860685904e82845bdb768b60
2016-09-30 21:49:09 +00:00
David Friedman
54a4e4a297 Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am: a9c3a0b529
am: bcbed91c2f

Change-Id: I3c9999e0e1aacaef58e227f9d004d8ebe3508fba
2016-09-30 21:45:39 +00:00
David Friedman
f7b37fa056 Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am: a9c3a0b529
am: b25c08fa32

Change-Id: I4c8f976ab1f679179f2b3221d8889088309bfdc0
2016-09-30 21:45:35 +00:00
Mark Lu
d93a31bbe0 Merge "Docs: Updates to backup documentation" into nyc-dev 2016-09-30 21:40:32 +00:00
David Friedman
bcbed91c2f Docs: Minor TOC and link fixes for newly released iteration of Perf docs.
am: a9c3a0b529

Change-Id: I8f874cbd848923e7f50ccd04e298bdc4e97f0b83
2016-09-30 21:39:38 +00:00
David Friedman
b25c08fa32 Docs: Minor TOC and link fixes for newly released iteration of Perf docs.
am: a9c3a0b529

Change-Id: I60cd53d9a3a70c7f16a52bb7358b90f01833c118
2016-09-30 21:39:35 +00:00
John Reck
6ba466ff3e SurfaceView only call forceDisconnect if isValid
Change-Id: I683c2f937f44d8b3d912839a3e91cbd5b5c7f437
Fixes: 31778946
Test: Manual, launch Cookie Jam then tap recents
2016-09-30 21:33:34 +00:00
David Friedman
a9c3a0b529 Docs: Minor TOC and link fixes for newly released iteration of Perf docs.
Change-Id: I61a9477ae129138932d4da29253bc2e6ece8357d
2016-09-30 14:28:56 -07:00
Etan Cohen
1c4749f69a Merge changes from topic 'cherry-pick' am: e3d5fa1094 am: 12b4883032
am: e8e0ee0789

Change-Id: I94b162cbd783573c629fcd50a3eb11db0d003441
2016-09-30 21:15:36 +00:00
Etan Cohen
1a92c54559 [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast am: 720d175757 am: 083f313756
am: a06821b2cf

Change-Id: I23d1aee5e8cf1134ea03e7a3b4f32fe931855f14
2016-09-30 21:14:30 +00:00
Etan Cohen
234039affa [NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8bede am: c3066c1d68
am: 4cb72b6125

Change-Id: I9decc48fd6486e5ef82c359c95d3b472ee5543d0
2016-09-30 21:13:09 +00:00
Etan Cohen
e8e0ee0789 Merge changes from topic 'cherry-pick' am: e3d5fa1094
am: 12b4883032

Change-Id: Icebffbcb4057e278d7b7c42448ac4e626060eaeb
2016-09-30 21:06:24 +00:00
Etan Cohen
a06821b2cf [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast am: 720d175757
am: 083f313756

Change-Id: I2fee098345991d73c8bfc5cedff4c1799628524e
2016-09-30 21:05:20 +00:00
Etan Cohen
4cb72b6125 [NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8bede
am: c3066c1d68

Change-Id: I0cb0fa75748704fd03dbc73d35a19a09999b645e
2016-09-30 21:04:04 +00:00
Etan Cohen
12b4883032 Merge changes from topic 'cherry-pick'
am: e3d5fa1094

Change-Id: I73321476de15f230ba19f04a5561238f0567eb9a
2016-09-30 20:56:58 +00:00
Etan Cohen
083f313756 [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
am: 720d175757

Change-Id: I5916af955c4452afe07a7fa35e8229aa53f56638
2016-09-30 20:56:54 +00:00
Etan Cohen
c3066c1d68 [NAN] Update API javadoc to clarify NAN status change broadcast scope
am: 4c22e8bede

Change-Id: I42709b7829a32c0767c20f6273451c478492f97b
2016-09-30 20:55:36 +00:00
Tao Bao
2a327506cf Merge "Handle the race condition when calling uncrypt services." am: 42d25b5992 am: 86df8ecdf3
am: ade17dea88

Change-Id: I617b48ed7e57a0903bdc577b18b45f9added0e65
2016-09-30 20:52:08 +00:00
Tao Bao
ade17dea88 Merge "Handle the race condition when calling uncrypt services." am: 42d25b5992
am: 86df8ecdf3

Change-Id: I1dc6ea14b4de99bf65f9efff4f22c0bd99e2f86f
2016-09-30 20:46:05 +00:00
Etan Cohen
e3d5fa1094 Merge changes from topic 'cherry-pick'
* changes:
  [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
  [NAN] Update API javadoc to clarify NAN status change broadcast scope
2016-09-30 20:45:02 +00:00
Tao Bao
86df8ecdf3 Merge "Handle the race condition when calling uncrypt services."
am: 42d25b5992

Change-Id: Ia5d37580f8bf1489fcc5ccf9c74cf64b94858dc6
2016-09-30 20:40:03 +00:00
Mark Lu
f0968050f6 Docs: Updates to backup documentation
Change-Id: I9349e5f8585687b1159f13029b6c13b89dafd8c9
2016-09-30 13:36:50 -07:00
Tao Bao
42d25b5992 Merge "Handle the race condition when calling uncrypt services." 2016-09-30 20:30:43 +00:00
Cheryl Potter
0a97ad6fb0 Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev am: c14495eb9a am: c6845ca160 am: 38652db818
am: 96b7987b14

Change-Id: If1cb49bf9ebd84b2ee9e657343045289ccb3785f
2016-09-30 19:38:40 +00:00
Cheryl Potter
58db78bfbd docs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4 am: 53e56f7331 am: 771703e195
am: 3b78cd86bf

Change-Id: If817210177cad502baae0bbe866a2d66c974cf51
2016-09-30 19:37:33 +00:00
Cheryl Potter
96b7987b14 Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev am: c14495eb9a am: c6845ca160
am: 38652db818

Change-Id: Ib4597f951b7f6d70c553a56abbbcd09fb8b4f6af
2016-09-30 19:33:34 +00:00
Cheryl Potter
3b78cd86bf docs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4 am: 53e56f7331
am: 771703e195

Change-Id: I9254fab2a0317f6e7bd642381bb94bb3987d42c9
2016-09-30 19:32:32 +00:00
Cheryl Potter
f02d8ec4cd Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev am: c14495eb9a
am: aa36af0287

Change-Id: I7081c1bad88d0e7a7bb17358eef72b025e6e8756
2016-09-30 19:27:42 +00:00
Cheryl Potter
38652db818 Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev am: c14495eb9a
am: c6845ca160

Change-Id: I1fb13ba2d5914b62720ee0e34dcc803d8de527d9
2016-09-30 19:27:25 +00:00
Cheryl Potter
26f475000d docs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4
am: b31f82f82b

Change-Id: Icb6144efa90a71dd40bfb83626488826517f219b
2016-09-30 19:26:57 +00:00
Cheryl Potter
771703e195 docs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4
am: 53e56f7331

Change-Id: I731c1268f0981693320b7fc3ce8248afc0889c72
2016-09-30 19:26:28 +00:00
Cheryl Potter
aa36af0287 Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev
am: c14495eb9a

Change-Id: Id0c2de291be82a9efeb8a5753cf1b604a0743454
2016-09-30 19:21:03 +00:00
Cheryl Potter
c6845ca160 Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev
am: c14495eb9a

Change-Id: I1168ba71a0c63a27b0cb7ee72b88bbd2669da1df
2016-09-30 19:20:59 +00:00
Cheryl Potter
b31f82f82b docs: help button redirects, see go/AS-help-buttons b/31810305
am: 27d595a5e4

Change-Id: Ia25aaef73ad39e2d419f0835d83929cf847bf91d
2016-09-30 19:20:58 +00:00
Cheryl Potter
53e56f7331 docs: help button redirects, see go/AS-help-buttons b/31810305
am: 27d595a5e4

Change-Id: I18d87344d5ec42f8b3e2784f04feaf419ad9eb03
2016-09-30 19:20:56 +00:00
Joe Fernandez
25df4c4602 Merge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83 am: d99744e99e am: f2461b7e67
am: ff7aa7fd88

Change-Id: I8a882497464ad92c33520b384cb127bdf8cc6b3c
2016-09-30 19:16:24 +00:00
Hemal Patel
bf94f838f4 Docs: Added info about vector drawable am: 47876e79de am: bfa9663e97 am: da400e9dd4
am: 28529d5989

Change-Id: I4c84047a34d37d0880f754dbe5192b4d94001992
2016-09-30 19:15:26 +00:00
TreeHugger Robot
c14495eb9a Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev 2016-09-30 19:13:25 +00:00
Joe Fernandez
ff7aa7fd88 Merge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83 am: d99744e99e
am: f2461b7e67

Change-Id: I771fb99f243d79af5a1d0d2f0fbaa8f7cc2d710c
2016-09-30 19:10:14 +00:00
Hemal Patel
28529d5989 Docs: Added info about vector drawable am: 47876e79de am: bfa9663e97
am: da400e9dd4

Change-Id: I8ae1ba757836f054d844291b3beb69a809610496
2016-09-30 19:09:22 +00:00
Joe Fernandez
51eea7e37a Merge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83
am: 7e1b38cf6c

Change-Id: I007b246acf5ea355f364cafda9c6d2f1337d8d75
2016-09-30 19:08:00 +00:00