OSDN Git Service
Hemal Patel [Tue, 9 Aug 2016 21:10:24 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ic306fd462773e6b6b457a0f8c1ee4a5bd931be22
Hemal Patel [Tue, 9 Aug 2016 21:03:00 +0000 (21:03 +0000)]
Docs: Changed custom_toast to toast_layout
am:
3b7309d753
Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
Chad Brubaker [Tue, 9 Aug 2016 19:50:35 +0000 (19:50 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31
am:
6e1f860c6a
Change-Id: I5c1f4d9785e56777e37da614ed6515113ae277c1
Chad Brubaker [Tue, 9 Aug 2016 19:43:50 +0000 (19:43 +0000)]
Merge "Add stub isCTVerificationRequired methods"
am:
5b63231a31
Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
Shawn Willden [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I8f350a045c1eb301418a91edfd975a388298507b
Shawn Willden [Tue, 9 Aug 2016 19:38:20 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Ic680cc75dbe80b57876dae701551cacfe2022086
Chad Brubaker [Tue, 9 Aug 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Add stub isCTVerificationRequired methods"
Shawn Willden [Tue, 9 Aug 2016 19:01:04 +0000 (19:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
am:
3188f77658
Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99
Shawn Willden [Tue, 9 Aug 2016 19:01:00 +0000 (19:01 +0000)]
Fix @link tags in keystore doc
am:
3f0526ea09
Change-Id: I3162cbf57341ab231b84544c04e02d2062dbd304
TreeHugger Robot [Tue, 9 Aug 2016 18:35:07 +0000 (18:35 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
Yi Kong [Tue, 9 Aug 2016 18:15:56 +0000 (18:15 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee
am:
2ae4d32ca3
Change-Id: I279138f6f7d585b2358537f129561d04c531dd00
Yi Kong [Tue, 9 Aug 2016 18:07:29 +0000 (18:07 +0000)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
am:
19df48b93b
Change-Id: I7fba48c95191b4a53acff70e89d59e30d3eb8e90
Yi Kong [Tue, 9 Aug 2016 18:07:12 +0000 (18:07 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7"
am:
67aaa079ee
Change-Id: I8b0bb02aca968de0baa7864cf4e123e4dd60b594
Yi Kong [Tue, 9 Aug 2016 17:59:07 +0000 (17:59 +0000)]
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit
f646aa14cdbf34e8784c0411d0baca26e364c1dc)
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
Neil Fuller [Tue, 9 Aug 2016 16:26:46 +0000 (16:26 +0000)]
Merge "Tidy up MockWebServer usage" am:
294ab080f4
am:
d0dc901341
Change-Id: I611d9e21a8e70e2e99de078e5218e34961cf7ee7
Neil Fuller [Tue, 9 Aug 2016 16:16:54 +0000 (16:16 +0000)]
Merge "Tidy up MockWebServer usage"
am:
294ab080f4
Change-Id: Ia22ce1e949ba3b611c0f2be60b3dbbafef7e4bb6
Neil Fuller [Tue, 9 Aug 2016 16:05:38 +0000 (16:05 +0000)]
Merge "Tidy up MockWebServer usage"
Neil Fuller [Tue, 9 Aug 2016 10:54:32 +0000 (10:54 +0000)]
Merge "Add a finalize() method to StrictJarFile" am:
d0c0c8dcab
am:
2ffb7ebae2
Change-Id: Ie947e8447ecd8e9a61b6d1115174180e41d74311
Neil Fuller [Tue, 9 Aug 2016 10:49:58 +0000 (10:49 +0000)]
Merge "Add a finalize() method to StrictJarFile"
am:
d0c0c8dcab
Change-Id: Iccab49c98b105aff6105e21274fbc099d10ecb55
Neil Fuller [Tue, 9 Aug 2016 10:43:18 +0000 (10:43 +0000)]
Merge "Add a finalize() method to StrictJarFile"
Tobias Thierer [Tue, 9 Aug 2016 09:07:43 +0000 (09:07 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged." am:
f61a449ee9
am:
8431c55fb8
Change-Id: I9b75016ac643c5bab03589ec82a4946fc2d9720e
Tobias Thierer [Tue, 9 Aug 2016 09:02:27 +0000 (09:02 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
am:
f61a449ee9
Change-Id: I826c175547a73123cd438ebe6991efee39a433d0
Tobias Thierer [Tue, 9 Aug 2016 08:55:34 +0000 (08:55 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:16 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am:
87c2ed97b8
Change-Id: If031e6c264ecaf23b32b62ac8d0e1036959d242d
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:12 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am:
d4197234bb
Change-Id: Iee3f043360bfd8df55265481843e165d1ffc832c
Kevin Hufnagle [Mon, 8 Aug 2016 23:35:25 +0000 (23:35 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:49:14 +0000 (22:49 +0000)]
docs: fixed generics in data binding code samples am:
b1b5efd3be
am:
7f703bde72
Change-Id: Ibdc351bc38832d8e0f02332be8aa1802e6c3ae65
Mark Lu [Mon, 8 Aug 2016 22:37:19 +0000 (22:37 +0000)]
docs: fixed generics in data binding code samples
am:
b1b5efd3be
Change-Id: Iecafea06866a4579824435467c5dd31859c0dbd4
Mark Lu [Mon, 8 Aug 2016 22:36:19 +0000 (22:36 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am:
a6ee9c1848
Change-Id: Id2540d8e557f2793d3e00a667c26b4efef49a3fc
Mark Lu [Mon, 8 Aug 2016 22:36:09 +0000 (22:36 +0000)]
docs: add info to SharedPreferences.Editor.putString
am:
fb48521f41
Change-Id: Icf8a1a92e8f18bcc63b52842ea75b00610feac9d
Mark Lu [Mon, 8 Aug 2016 22:26:34 +0000 (22:26 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
joonyoung.cho [Mon, 8 Aug 2016 22:01:29 +0000 (22:01 +0000)]
Merge "fix safeMode status in AppWidgetService" am:
78a72f0698
am:
cbd4ad1f7e
Change-Id: I879ba624b3d3693472e6623e084660d4cadf6b95
joonyoung.cho [Mon, 8 Aug 2016 21:53:34 +0000 (21:53 +0000)]
Merge "fix safeMode status in AppWidgetService"
am:
78a72f0698
Change-Id: I21559690f6371102cf48132d8930343923d60011
Treehugger Robot [Mon, 8 Aug 2016 21:36:45 +0000 (21:36 +0000)]
Merge "fix safeMode status in AppWidgetService"
Tobias Thierer [Thu, 21 Jul 2016 14:05:19 +0000 (15:05 +0100)]
Ensure apps cannot prevent uncaught exceptions being logged.
Let RuntimeInit use an UncaughtExceptionPreHandler to log an exception
rather than relying on UncaughtHandler, which apps can replace. This
makes it easier to diagnose application death, especially during app
compatibility testing for a new version of Android.
Test: Verified manually, with the help of a small sample app (not
checked in), that stacktraces for RuntimeExceptions thrown on main
or background threads are logged even when the app set a default
UncaughtExceptionHandler that swallows the exception with no action.
Note that such an inappropriate UncaughtExceptionHandler will still
cause threads to die without the app being killed, which it should be.
In an exception then happens on the main thread, the app will freeze
until the ANR dialog kicks in after a few seconds. I have manually
verified that this behavior is unchanged from before this CL.
No new integration tests are included because the default system
behavior has not changed.
Bug:
29624607
Change-Id: Ie87377b0bcadc3ba4083a8ab1bedb8f3dd95a4bd
Mark Salyzyn [Fri, 5 Aug 2016 19:28:05 +0000 (19:28 +0000)]
Merge "select_logpersist_title char limit" into stage-aosp-master
am:
cc6fd4549b
Change-Id: I393d9ea62334cac5fc6f07e53d2882323591716f
Mark Salyzyn [Fri, 5 Aug 2016 19:28:03 +0000 (19:28 +0000)]
select_logpersist_title char limit
am:
41f85953c2
Change-Id: I8852b239862c1bcff1ecfc24e4554f36fd5711df
TreeHugger Robot [Fri, 5 Aug 2016 19:22:40 +0000 (19:22 +0000)]
Merge "select_logpersist_title char limit" into stage-aosp-master
Keith Mok [Fri, 5 Aug 2016 18:41:07 +0000 (18:41 +0000)]
Merge "Fix random crash in libhwui" am:
3f67a1855e
am:
9aaf189103
Change-Id: I87d1c7b03bbf231fa059df53b667687ec68589ef
Keith Mok [Fri, 5 Aug 2016 18:37:14 +0000 (18:37 +0000)]
Merge "Fix random crash in libhwui"
am:
3f67a1855e
Change-Id: I8dfcad3d00b2cca955457142b963934143ec2cbd
Treehugger Robot [Fri, 5 Aug 2016 18:23:14 +0000 (18:23 +0000)]
Merge "Fix random crash in libhwui"
Mark Salyzyn [Fri, 5 Aug 2016 16:28:21 +0000 (09:28 -0700)]
select_logpersist_title char limit
(cherry pick from commit
0e86d328d67658d49cb3153356e92092c873927f)
increase select_logpersist_title character limit to 60
increase select_logpersist_titles character limit to 26
Bug:
29313564
Change-Id: I15f000bf155f33a7d4a1cc6c5434552f43803f58
Mark Lu [Thu, 4 Aug 2016 21:45:42 +0000 (14:45 -0700)]
docs: fixed generics in data binding code samples
Generic types, such as List<String>, must be escaped when they are
used in XML. For example, List<String>. This commit adds
escape characters to the XML samples in the data binding page.
Bug:
30691285
Change-Id: If55ed55d13fb11038e2495884c79698e67219108
Tobias Thierer [Fri, 5 Aug 2016 12:51:50 +0000 (12:51 +0000)]
Merge "APIs for ProcessBuilder.Redirect" am:
e49469aed1
am:
c548ff23bd
Change-Id: I97d741f344ee59e8f493f0ac8d0b41a63adc9c14
Tobias Thierer [Fri, 5 Aug 2016 12:44:48 +0000 (12:44 +0000)]
Merge "APIs for ProcessBuilder.Redirect"
am:
e49469aed1
Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
Tobias Thierer [Fri, 5 Aug 2016 12:44:35 +0000 (12:44 +0000)]
Update api/test-current.txt for ProcessBuilder API
am:
6af44aeea0
Change-Id: I0009f3d758af696aca14851f53459c6a332beb47
Tobias Thierer [Thu, 4 Aug 2016 18:04:46 +0000 (19:04 +0100)]
Update api/test-current.txt for ProcessBuilder API
Test: make update-api docs
Bug:
27464570
Change-Id: Iee1fec0efb241ba091494467ab3632675c1d07d4
Tobias Thierer [Fri, 5 Aug 2016 12:36:35 +0000 (12:36 +0000)]
Merge "APIs for ProcessBuilder.Redirect"
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 10:32:44 +0000 (10:32 +0000)]
Merge "Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master
am:
e2e65a4708
Change-Id: If3fe3c4e5d242dc768789b093ddef2bbc08f4c78
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 10:32:39 +0000 (10:32 +0000)]
Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82
am:
49929ccf46
Change-Id: Ie9d2d41124395588fa58dc0f97447a9e77094609
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 10:25:23 +0000 (10:25 +0000)]
Merge "Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 09:51:59 +0000 (09:51 +0000)]
Merge "Track libcore change
0e393b4d628541e84e31210342f4103315c07e23" am:
50f3429d14
am:
622e170338
Change-Id: Ia1fde043f68030d5676c39f9eda632061ef09eab
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 09:44:55 +0000 (09:44 +0000)]
Merge "Track libcore change
0e393b4d628541e84e31210342f4103315c07e23"
am:
50f3429d14
Change-Id: I2fdd89afd9cfc0cc36be2664dee559e7b0977c6d
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 09:36:41 +0000 (09:36 +0000)]
Przemyslaw Szczepaniak [Thu, 4 Aug 2016 15:49:27 +0000 (16:49 +0100)]
Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82
Version with test-current.txt
Bug:
28666126
Change-Id: I3677508ff00c381c88fe9c767ec7037493b574f8
Hans Boehm [Fri, 5 Aug 2016 03:04:08 +0000 (20:04 -0700)]
resolve merge conflicts of
c73e080 to nyc-dev-plus-aosp
Change-Id: I9629e28bff28a67a6584c5e67a01ef25428a2194
Hans Boehm [Fri, 5 Aug 2016 02:05:57 +0000 (02:05 +0000)]
Merge "Update SMP documentation."
am:
497ac5eccb
Change-Id: I06d06e205a8bf7646500fa6c8d86eb7cfa49e6ce
Hans Boehm [Fri, 5 Aug 2016 01:59:38 +0000 (01:59 +0000)]
Merge "Update SMP documentation."
Kevin Hufnagle [Thu, 4 Aug 2016 21:33:36 +0000 (14:33 -0700)]
docs: Revised "Optimizing Content for the Assistant" page.
Bug:
25080159
Change-Id: Ie4167ba732ffbd401cabcb7f0ba3bac41a029506
Andre Eisenbach [Thu, 4 Aug 2016 21:29:34 +0000 (21:29 +0000)]
Merge "Fix bad index usage" am:
5cfe8a8315
am:
83272db445
Change-Id: Ie20fd9eea99d4ec730e40045a693181da70ec786
Hans Boehm [Mon, 14 Sep 2015 20:50:00 +0000 (13:50 -0700)]
Update SMP documentation.
The old version was seriously obsolete, primarily in that it ignored
C11 and C++11 atomics and the programming model underlying them. As
a result it paid way too much attention to hardware characteristics,
which 0.001% of application programmers should really be aware of.
And some of those hardware descriptions were also obsolete.
This is a fairly complete rewrite.
Bug:
18523857
Change-Id: Icc14a390f74486193486c2ba07a86b05611e7d3c
Jakub Pawlowski [Thu, 4 Aug 2016 20:46:32 +0000 (20:46 +0000)]
Merge "Fix bad index usage"
am:
5cfe8a8315
Change-Id: I36807979de4f0f74f9dd3ef6f3b2a60e83346b0f
Andre Eisenbach [Thu, 4 Aug 2016 20:20:02 +0000 (20:20 +0000)]
Merge "Fix bad index usage"
Jakub Pawlowski [Thu, 4 Aug 2016 20:16:32 +0000 (13:16 -0700)]
Fix bad index usage
Bug:
27999121
Change-Id: Ie2ba6f71bbf6f789a3c1016ba2f0051b809ac87e
Hemal Patel [Thu, 4 Aug 2016 19:48:26 +0000 (19:48 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am:
ca7eee3d11
am:
ab35b73d1b
Change-Id: I006d4a5df9d850c3367d2a441fe86c320fee6c56
Hemal Patel [Thu, 4 Aug 2016 19:48:19 +0000 (19:48 +0000)]
Docs: Fixed info about spanning multiple columns am:
64e88cd296
am:
611f50d62f
Change-Id: Ie4daa14c817f2781e06a6a0d1d68a245780580e8
Hemal Patel [Thu, 4 Aug 2016 19:43:20 +0000 (19:43 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs
am:
ca7eee3d11
Change-Id: I94b5abbf1d292a01ba439cafd80938f7fc92854d
Hemal Patel [Thu, 4 Aug 2016 19:43:18 +0000 (19:43 +0000)]
Docs: Fixed info about spanning multiple columns
am:
64e88cd296
Change-Id: I8c4219e946fddbfc023bbe77549cc12fc0b6bd3a
Hemal Patel [Thu, 4 Aug 2016 19:38:41 +0000 (19:38 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs
Bert McMeen [Thu, 4 Aug 2016 18:28:27 +0000 (18:28 +0000)]
Docs: Fixed typo in API Overview am:
844c43a904
am:
653b768997
Change-Id: I55ac0a468ff1f0748ffeaca1b99b0c6992cef676
Bert McMeen [Thu, 4 Aug 2016 18:20:51 +0000 (18:20 +0000)]
Docs: Fixed typo in API Overview
am:
844c43a904
Change-Id: Ia855a58708afc4f12bae4b234b0f7ba10798aba4
Bert McMeen [Thu, 4 Aug 2016 18:08:50 +0000 (18:08 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
am:
62faea4f12
Change-Id: I849e6e3fed25bf7977263b1f57473dbaf544eb78
Bert McMeen [Thu, 4 Aug 2016 18:08:43 +0000 (18:08 +0000)]
Docs: Fixed typo in API Overview
am:
f27ab3c126
Change-Id: I08ed3c58d13fbeb93e331897641977633a6b807e
Bert McMeen [Tue, 2 Aug 2016 20:45:24 +0000 (13:45 -0700)]
Docs: Fixed typo in API Overview
Bug:
30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
(cherry picked from commit
f27ab3c12625f34a4221477001a603390b505e65)
Bert McMeen [Thu, 4 Aug 2016 18:01:27 +0000 (18:01 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
Chih-hung Hsieh [Thu, 4 Aug 2016 17:25:35 +0000 (17:25 +0000)]
Merge "Enable clang for arm64." am:
a11a8e5086
am:
9650521ed1
Change-Id: Ia9435472a720bc22255924cf4caee13eafda5870
Chih-Hung Hsieh [Thu, 4 Aug 2016 17:19:10 +0000 (17:19 +0000)]
Merge "Enable clang for arm64."
am:
a11a8e5086
Change-Id: If6069ad099ec5068b9b77f1ea84b85ff4a20438d
Chih-hung Hsieh [Thu, 4 Aug 2016 17:13:53 +0000 (17:13 +0000)]
Merge "Enable clang for arm64."
Chih-Hung Hsieh [Wed, 3 Aug 2016 17:56:33 +0000 (10:56 -0700)]
Enable clang for arm64.
emutls should work now with latest prebuilt clang/llvm.
BUG:
25642296
Test: build and boot up on arm64 emulator.
Change-Id: I5c8dd36a1575436e5fd56e91f7c285f2b3e6546f
(cherry picked from commit
8ffb6b76f7a72e14882e09f882494e5f7d5fc45d)
Przemyslaw Szczepaniak [Thu, 4 Aug 2016 12:08:22 +0000 (12:08 +0000)]
Missing test-current.txt for libcore change
ea47d5d712edcaef726a3e12065729be21699afe
am:
82957239fe
Change-Id: Ic29f6cd27e4f84dc5afb49360ffd2235ab25aa71
Przemyslaw Szczepaniak [Thu, 4 Aug 2016 11:54:39 +0000 (12:54 +0100)]
Missing test-current.txt for libcore change
ea47d5d712edcaef726a3e12065729be21699afe
Change-Id: I691a53f92bc1cfe0a9c6d5ad9d7d3d259ce0aabb
Test: make -j 32 update-api
Bug:
30402085
Tobias Thierer [Thu, 4 Aug 2016 11:06:54 +0000 (11:06 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am:
f1d119ccd3
am:
97b24c2f6a
Change-Id: I33dad5406389705ca2daa9baa75c1c7b42df046e
Tobias Thierer [Thu, 4 Aug 2016 11:00:03 +0000 (11:00 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"
am:
f1d119ccd3
Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
Tobias Thierer [Thu, 4 Aug 2016 10:51:13 +0000 (10:51 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"
Sreevani Sreejith [Thu, 4 Aug 2016 02:37:12 +0000 (02:37 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs am:
3faf6114b0
am:
f5a2fbc156
Change-Id: I914433dbb9ab473d9dc14b317478af0a1db92e23
sreevanis [Thu, 4 Aug 2016 02:37:09 +0000 (02:37 +0000)]
resolve merge conflicts of
9d47cae to nyc-docs am:
d5cabb92bc
am:
fdaac48e99
Change-Id: I525b4b81660dfd21e7ef992ee803f94d58c629b9
sreevanis [Thu, 4 Aug 2016 02:23:43 +0000 (02:23 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
am:
3faf6114b0
Change-Id: I80e8d39a9d6f58e2cc3091690f202d1453a6b8e6
sreevanis [Thu, 4 Aug 2016 02:23:39 +0000 (02:23 +0000)]
resolve merge conflicts of
9d47cae to nyc-docs
am:
d5cabb92bc
Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
Sreevani Sreejith [Thu, 4 Aug 2016 02:14:25 +0000 (02:14 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
Andre Eisenbach [Thu, 4 Aug 2016 01:43:00 +0000 (01:43 +0000)]
Merge "HFP 1.7 profile update (3/4)" am:
f28f6bb2b0
am:
a095ee3c1d
Change-Id: I31570d1d9da08e6d7481ffead5ef7625c88018f2
Mudumba Ananth [Thu, 4 Aug 2016 01:32:41 +0000 (01:32 +0000)]
Merge "HFP 1.7 profile update (3/4)"
am:
f28f6bb2b0
Change-Id: I0211cecf91f324d24b7b5524344812f7d6b6602a
Kevin Hufnagle [Thu, 4 Aug 2016 01:14:36 +0000 (01:14 +0000)]
docs: Updated wording of callout describing device opt-out options. am:
b48909ed52
am:
bdbe6fd94f
Change-Id: I0a74e4b1b26a5456e9df547333ddd2e4cf51de20
Andre Eisenbach [Thu, 4 Aug 2016 01:06:46 +0000 (01:06 +0000)]
Merge "HFP 1.7 profile update (3/4)"
Joe Fernandez [Thu, 4 Aug 2016 01:05:50 +0000 (01:05 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am:
51a582fa85
am:
6ad22ca614
Change-Id: I0325827620ff0e37e65d1ea0c97adeec875de678
Joe Fernandez [Thu, 4 Aug 2016 01:05:47 +0000 (01:05 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am:
712c053462
am:
337279df50
Change-Id: I4652d7267c8796e709dfc82dd9417a8aa704128f
Joe Fernandez [Thu, 4 Aug 2016 01:05:44 +0000 (01:05 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am:
d6f1d8ea28
am:
0af74fa732
Change-Id: I8e166e01d329bc6ef325958ae0a09029f8eacd2f
Kevin Hufnagle [Thu, 4 Aug 2016 01:05:11 +0000 (01:05 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC am:
684d849621
am:
a007a4d772
Change-Id: I136646a94f44386cc39f3d9d7c6f688116a85db0
Kevin Hufnagle [Thu, 4 Aug 2016 01:04:02 +0000 (01:04 +0000)]
docs: Added page on DAC describing ARC manifest file considerations. am:
178caa888f
am:
ebd455b077
Change-Id: I4f229345b1f8198048dc1eb9a4da9ca0e8f94cc3
OSDN Git Service
