OSDN Git Service
Kevin Hufnagle [Mon, 26 Sep 2016 22:58:39 +0000 (22:58 +0000)]
docs: Wi-Fi settings example now uses Settings constant correctly
am:
4d215ad49c
Change-Id: I0b93da95d9b151a3549c39dd1d23744b53799f12
Kevin Hufnagle [Mon, 26 Sep 2016 22:57:44 +0000 (22:57 +0000)]
Merge "docs: Changed Android branding guidelines for clarity" into nyc-dev
am:
2dbf06da2b
Change-Id: Ia82c994d04d4e4e88e73cdf6f0f806e81a26931f
Kevin Hufnagle [Mon, 26 Sep 2016 22:54:55 +0000 (22:54 +0000)]
docs: Changed Android branding guidelines for clarity
am:
6a399a26ae
Change-Id: I937f2d4188605ca5ea1f4037f74562e94406808a
Kevin Hufnagle [Mon, 26 Sep 2016 22:52:56 +0000 (22:52 +0000)]
Merge "docs: Adjusted return value desc. for getApplicationEnabledSetting" into nyc-dev
am:
91ade06f93
Change-Id: If696c2eb696e06bd2e91fe392636660ade8d3c9e
Kevin Hufnagle [Mon, 26 Sep 2016 22:52:54 +0000 (22:52 +0000)]
docs: Adjusted return value desc. for getApplicationEnabledSetting
am:
5add769f59
Change-Id: Ic0566aa6e2764a9d0db58c6f66ad028229a8fdca
Kevin Hufnagle [Mon, 26 Sep 2016 22:36:15 +0000 (22:36 +0000)]
Merge "docs: Changed Android branding guidelines for clarity" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:35:24 +0000 (22:35 +0000)]
Merge "docs: Adjusted return value desc. for getApplicationEnabledSetting" into nyc-dev
Scott Main [Mon, 26 Sep 2016 21:59:42 +0000 (21:59 +0000)]
Merge "change the Studio banner link from release notes to features" into nyc-dev
am:
fe6b57d6ae
Change-Id: I6f8852531dbad217408b6963fd302021791b012f
smain@google.com [Mon, 26 Sep 2016 21:59:39 +0000 (21:59 +0000)]
change the Studio banner link from release notes to features
am:
65873fbaee
Change-Id: I6f594d2d2a030039ab443f630a45e7cb2b0912aa
Scott Main [Mon, 26 Sep 2016 21:44:05 +0000 (21:44 +0000)]
Merge "change the Studio banner link from release notes to features" into nyc-dev
Hemal Patel [Mon, 26 Sep 2016 20:59:05 +0000 (20:59 +0000)]
Merge "Docs: Added contents for Vector Drawables" into nyc-docs am:
342fe97eaa
am:
62764168c6
Change-Id: I9e4b12453269fb43f1713052f3b53e37f8af0558
Hemal Patel [Mon, 26 Sep 2016 20:58:10 +0000 (20:58 +0000)]
Docs: Added contents for Vector Drawables am:
b4bab2d0ee
am:
ff9f8985d0
Change-Id: I16f090105c389f2095596680d46fab2a96af4e40
Hemal Patel [Mon, 26 Sep 2016 20:53:05 +0000 (20:53 +0000)]
Merge "Docs: Added contents for Vector Drawables" into nyc-docs
am:
342fe97eaa
Change-Id: Ie01dcbabeee24e67965ac527b13336e68fdff8f3
Hemal Patel [Mon, 26 Sep 2016 20:53:03 +0000 (20:53 +0000)]
Docs: Added contents for Vector Drawables
am:
b4bab2d0ee
Change-Id: Ic7e9e869586e764896184ae0a3ba39d909b9702b
Hemal Patel [Mon, 26 Sep 2016 20:44:15 +0000 (20:44 +0000)]
Merge "Docs: Added contents for Vector Drawables" into nyc-docs
smain@google.com [Mon, 26 Sep 2016 19:49:52 +0000 (12:49 -0700)]
change the Studio banner link from release notes to features
Change-Id: I40cd1a4256f143957703d92b8a524bf8444dc56a
smain@google.com [Mon, 26 Sep 2016 19:37:22 +0000 (19:37 +0000)]
revise Develop landing page banner for Studio 2.2
am:
a3252f103d
Change-Id: If3b984037cb9d058107dfd7dbe04b2c0bcc9d5be
smain@google.com [Mon, 26 Sep 2016 19:36:26 +0000 (19:36 +0000)]
update landing page banner for studio 2.2
am:
8ddfa9ccf6
Change-Id: I6a91611a2761d32fdbcc2defb3095ffbaf380714
smain@google.com [Mon, 26 Sep 2016 19:18:30 +0000 (12:18 -0700)]
revise Develop landing page banner for Studio 2.2
Change-Id: I7eec3b72d09b87a56dfebd5391f9eac55dc26853
smain@google.com [Thu, 22 Sep 2016 21:54:53 +0000 (14:54 -0700)]
update landing page banner for studio 2.2
Change-Id: Ibd22a8ac7e7d716ee169a6c8ddc67bb8f54e9337
smain@google.com [Mon, 26 Sep 2016 17:30:37 +0000 (17:30 +0000)]
switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC
am:
01569c41e7
Change-Id: Ia1344bf39709ece4ec33aaeb67c9520bdc5d7176
Mark Lu [Mon, 26 Sep 2016 17:23:41 +0000 (17:23 +0000)]
Merge "docs: improve docs for sqlite package summary" into nyc-dev
am:
0a544fa4a7
Change-Id: I9595c5ba41e2d31b94d10b45f0b102f9319066b0
Mark Lu [Mon, 26 Sep 2016 17:23:38 +0000 (17:23 +0000)]
docs: improve docs for sqlite package summary
am:
59640a9f1c
Change-Id: I2198d8f3a88980594011072f0dbd3b6a02635939
smain@google.com [Mon, 26 Sep 2016 17:23:13 +0000 (10:23 -0700)]
switch utm_medium to utm_source
fix a couple hashes
update the test recorder URL from TAC to DAC
Change-Id: Ia57823559e3629320e9562a585972ccb148fe07e
Mark Lu [Mon, 26 Sep 2016 17:22:18 +0000 (17:22 +0000)]
Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev
am:
b764c94a26
Change-Id: Ifa21bc0dc7722e28f294877aae99e5b4cc1e1997
Mark Lu [Mon, 26 Sep 2016 17:22:15 +0000 (17:22 +0000)]
docs: Update docs for SQLiteDatabase replace methods
am:
1e20208d90
Change-Id: Ibf13d426352f8845b9fd8086ebfbf54af3f3017c
Mark Lu [Mon, 26 Sep 2016 17:21:04 +0000 (17:21 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev
am:
537481e2c3
Change-Id: I266099fbc1102a5accd1080638745924718ec6fc
Hemal Patel [Mon, 26 Sep 2016 17:21:00 +0000 (17:21 +0000)]
Fixed a typo in the code sample
am:
247d1c9ea8
Change-Id: I2f004e4900ed39d6564e0c3947f27fa79eac2266
Mark Lu [Mon, 26 Sep 2016 17:12:48 +0000 (17:12 +0000)]
Merge "docs: improve docs for sqlite package summary" into nyc-dev
Mark Lu [Mon, 26 Sep 2016 17:12:29 +0000 (17:12 +0000)]
Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev
Mark Lu [Mon, 26 Sep 2016 17:11:54 +0000 (17:11 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev
Josh Horwich [Mon, 26 Sep 2016 15:31:45 +0000 (15:31 +0000)]
Merge "Docs: Fix missing space" into nyc-dev
am:
fd0a31c0aa
Change-Id: Ib888812a14fde7497d2979224b44053c7b78d694
Josh Horwich [Mon, 26 Sep 2016 15:31:42 +0000 (15:31 +0000)]
Docs: Fix missing space
am:
999fe148e4
Change-Id: I2b68e855bcb9e3f76d8cf04c93097a265b03d13d
TreeHugger Robot [Mon, 26 Sep 2016 15:22:54 +0000 (15:22 +0000)]
Merge "Docs: Fix missing space" into nyc-dev
Hemal Patel [Mon, 15 Aug 2016 21:31:42 +0000 (14:31 -0700)]
Docs: Added contents for Vector Drawables
Added contents to give an overview of VectorDrawables and
AnimatedVectorDrawables. For better understanding, added two graphic
files to explain the overall working of the XML file and the graphic
that is rendered as an output of the XML file.
Bug:
28072772
Change-Id: I9b6513c4b6e5aec59f45155963ff732fdd7b5784
Mark Lu [Fri, 23 Sep 2016 22:19:50 +0000 (22:19 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
am:
d91c303e6c
Change-Id: I63e930d5d3e0e6da2af44a62d2e4f781719b4028
Mark Lu [Fri, 23 Sep 2016 22:19:47 +0000 (22:19 +0000)]
docs: update javadoc description for View.setVisibility() method
am:
ae0459f532
Change-Id: Ie217e46288a11e86b2e5b6e56d8ce5cb2a214861
Mark Lu [Fri, 23 Sep 2016 22:18:20 +0000 (22:18 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev
am:
dc24613bf3
Change-Id: I9ea4800646bbe165551d6782beb6cc337ffa7055
Mark Lu [Fri, 23 Sep 2016 22:18:17 +0000 (22:18 +0000)]
docs: update docs for uses-feature element
am:
b463a6db08
Change-Id: I51394b88aec2716551ddfe329bf9a9726e156739
Mark Lu [Fri, 23 Sep 2016 22:16:40 +0000 (22:16 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev
am:
7df8927691
Change-Id: Ibcb55559a05d383182870e5f38fe9432e22cf526
Mark Lu [Fri, 23 Sep 2016 22:16:37 +0000 (22:16 +0000)]
docs: Add param info to TextView.setTextColor
am:
193879a8b6
Change-Id: I5b157858dd056b2510486ad7546ab74e1287005c
Mark Lu [Fri, 23 Sep 2016 22:10:36 +0000 (22:10 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:10:19 +0000 (22:10 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:09:31 +0000 (22:09 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 21:52:32 +0000 (21:52 +0000)]
Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
am:
c6a1076e40
Change-Id: Iafe629eba6bb9e7d2c6373ef1ffa78b52cac709f
Mark Lu [Fri, 23 Sep 2016 21:52:30 +0000 (21:52 +0000)]
docs: Mention SwitchCompat in Switch and toggle documentation
am:
3404032dfc
Change-Id: I1df8dd7f48f095a93aaff120b0f86e2ccc6467fd
Mark Lu [Fri, 23 Sep 2016 21:47:27 +0000 (21:47 +0000)]
Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
Andrew Solovay [Fri, 23 Sep 2016 21:25:22 +0000 (21:25 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev
am:
ddcf2deb14
Change-Id: Ic467b0a3389dbb8e1428f301a2e842d427134720
Andrew Solovay [Fri, 23 Sep 2016 21:25:21 +0000 (21:25 +0000)]
docs: Removed two images that were moved to Piper in April
am:
f955d4cd9f
Change-Id: I9d4d814b765539b5dec691bddadfb6658d1c976f
Andrew Solovay [Fri, 23 Sep 2016 21:15:28 +0000 (21:15 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev
Jaewan Kim [Thu, 22 Sep 2016 23:20:47 +0000 (23:20 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074 am:
1ab448b5d5 am:
5b649ddcc6 -s ours
am:
e36701214a
Change-Id: I648f67d04ae9fd74ea0ea06f47ffea5abde042f9
Jaewan Kim [Thu, 22 Sep 2016 23:08:41 +0000 (23:08 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320 am:
03bad07418 am:
afab98a69e -s ours
am:
738c21253a
Change-Id: I789e62154186ed42449cd1904d906778a1ea364b
Jaewan Kim [Thu, 22 Sep 2016 23:08:24 +0000 (23:08 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074 am:
1ab448b5d5
am:
5b649ddcc6 -s ours
Change-Id: I7de1101955e5152cd1fb5858ac93c9e94697b01b
Jaewan Kim [Thu, 22 Sep 2016 22:51:23 +0000 (22:51 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320 am:
03bad07418
am:
afab98a69e -s ours
Change-Id: I8ddca6c69539eb9cc568e5fcec011a3c58450fcc
Jaewan Kim [Thu, 22 Sep 2016 22:40:32 +0000 (22:40 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074
am:
1ab448b5d5
Change-Id: I4a1da4793ef9c53447742ea9e1f7a34fbffb8807
Jaewan Kim [Thu, 22 Sep 2016 22:39:30 +0000 (22:39 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320
am:
03bad07418
Change-Id: Ia687cf7aa14eb11452d390d47bc13ba4dfba0cda
Jaewan Kim [Thu, 22 Sep 2016 22:27:37 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31
am:
09edfde074
Change-Id: I8365e943aab82305fbc5775e8044dc7f014c0cdc
Jaewan Kim [Thu, 22 Sep 2016 22:26:12 +0000 (22:26 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055
am:
351aa0b320
Change-Id: I4cfe42fedcde6f49f259686481bfe61660d02bfc
Jaewan Kim [Thu, 22 Sep 2016 22:21:52 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours
am:
2cd4383c31
Change-Id: I0e6d2e4c60383c95a4a73bccfdb12472152e86a0
Jaewan Kim [Thu, 22 Sep 2016 22:20:54 +0000 (22:20 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours
am:
e9a9e2f055
Change-Id: Iaa0f0e473c9e2389c75c5d4dd9b4ff5e244ba442
Jaewan Kim [Thu, 22 Sep 2016 21:57:25 +0000 (21:57 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87 am:
832179120f -s ours
am:
c547eeda12
Change-Id: I883bb3f96212f7f25d3aa2310e559ec2b6cc063c
Jaewan Kim [Thu, 22 Sep 2016 21:56:51 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81
am:
585f642d65 -s ours
Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14
Jaewan Kim [Thu, 22 Sep 2016 21:56:29 +0000 (21:56 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890 am:
4da22f27f6 -s ours
am:
36068a2f00
Change-Id: I64859a44f3c4219cfbfd3bde284be5e6d55025c3
Jaewan Kim [Thu, 22 Sep 2016 21:55:51 +0000 (21:55 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9
am:
ed3e26e2be -s ours
Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e
Andrew Solovay [Thu, 22 Sep 2016 21:24:57 +0000 (14:24 -0700)]
docs: Removed two images that were moved to Piper in April
Scott had migrated these graphics to Piper in April, but they've
stayed in Gerrit. These graphics had been updated in Gerrit since
then, so they got out of sync with Piper.
Set up Critique CL cr/
133998971 to migrate the latest versions
to Piper (and sent to Scott for review); setting up a separate
CL here to remove the files, so they won't accidentally get
edited in the wrong place again.
Change-Id: Ice9dda71ae3604b1fc3aab15746dc41e759b80a6
Ajay Panicker [Thu, 22 Sep 2016 20:35:06 +0000 (20:35 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a am:
afeaced48f am:
2a214fc5f2 am:
0ec10c8fdc -s ours
am:
916552b0c9
Change-Id: I50571a7570a8f98d2e1b473694534ac478b060b7
Jaewan Kim [Thu, 22 Sep 2016 20:35:00 +0000 (20:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87
am:
832179120f -s ours
Change-Id: Iefcfa52c1a34b05102c7188b3e7232584cffba53
Jaewan Kim [Thu, 22 Sep 2016 20:34:22 +0000 (20:34 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79
am:
462493ee81
Change-Id: I822c5aeb87aea023aa8dba38a4beb6de98225f4a
Jaewan Kim [Thu, 22 Sep 2016 20:33:44 +0000 (20:33 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890
am:
4da22f27f6 -s ours
Change-Id: Ie18197c55022197b4dcc9f8e2d45cb5cc78dcdd0
Jaewan Kim [Thu, 22 Sep 2016 20:33:24 +0000 (20:33 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9
am:
3ea1f124f9
Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1
Jaewan Kim [Thu, 22 Sep 2016 20:05:57 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243
am:
dd883c7e87
Change-Id: Id9a90d8d49724435fced962b42a89edbb90846c3
Jaewan Kim [Thu, 22 Sep 2016 20:05:49 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours
am:
ded4df2e79
Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61
Jaewan Kim [Thu, 22 Sep 2016 20:03:57 +0000 (20:03 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours
am:
499871ebe9
Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a
Dirk Dougherty [Thu, 22 Sep 2016 20:03:56 +0000 (20:03 +0000)]
Copy IN files to ID, temporarily leaving IN in place.
am:
9bbc0a2421
Change-Id: If43965eae6d174f7dbfb182b06c357be8fd67bc3
Jaewan Kim [Thu, 22 Sep 2016 20:03:53 +0000 (20:03 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3
am:
0e31d93890
Change-Id: I7f0dc285e10f6786137f6446dc77a53fe1549dfc
Ajay Panicker [Thu, 22 Sep 2016 19:56:50 +0000 (19:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a am:
afeaced48f am:
2a214fc5f2
am:
0ec10c8fdc -s ours
Change-Id: I66bfa158fdf948f36a98c20c3afc7ee7d73bb920
Ajay Panicker [Thu, 22 Sep 2016 19:23:06 +0000 (19:23 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a am:
afeaced48f
am:
2a214fc5f2
Change-Id: I95bd7f14d35808722c0453e6e441d3bc96528010
Jaewan Kim [Thu, 22 Sep 2016 19:01:08 +0000 (19:01 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652
am:
bed7636243
Change-Id: I7d0fdb9db8a0593fe279a119751c17f940f88925
Jaewan Kim [Thu, 22 Sep 2016 19:00:14 +0000 (19:00 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73
am:
900d1c90b3
Change-Id: I03db2d87943557beb6a98aa72f986c1ad0f7f03d
Jaewan Kim [Thu, 22 Sep 2016 18:09:45 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
am:
fce3b76452 -s ours
Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936
Jaewan Kim [Thu, 22 Sep 2016 18:09:41 +0000 (18:09 +0000)]
DO NOT MERGE Fix build
am:
dfedca4e43 -s ours
Change-Id: Ibf95b4c061129b2cd047e3b8a8da9f90cfea7e8f
Ajay Panicker [Thu, 22 Sep 2016 18:07:40 +0000 (18:07 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a
am:
afeaced48f
Change-Id: I579d7384e9a12e942a0afcd80fc41e9f2877eedb
Jaewan Kim [Thu, 22 Sep 2016 17:46:56 +0000 (17:46 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
Jaewan Kim [Thu, 22 Sep 2016 05:56:33 +0000 (14:56 +0900)]
DO NOT MERGE Fix build
Bug:
29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05
Dirk Dougherty [Thu, 22 Sep 2016 17:21:29 +0000 (10:21 -0700)]
Copy IN files to ID, temporarily leaving IN in place.
Change-Id: I1a92e4254fe57817cb555629059539aaec47e182
Scott Main [Thu, 22 Sep 2016 16:57:45 +0000 (16:57 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
am:
8b05feb5b4
Change-Id: Ib2367374818a66cb257ab772204dc1be79e47242
Adarsh Fernando [Thu, 22 Sep 2016 16:57:42 +0000 (16:57 +0000)]
Removing a temporary redirect for /ndk/guides/cmake.html
am:
dafcbfa693
Change-Id: I8c190be258c96b33d31b400f6c935a4a40fe722e
Ajay Panicker [Thu, 22 Sep 2016 16:38:14 +0000 (16:38 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours am:
7f84596929 -s ours am:
ed82c6fac8 am:
c1f8a09c1e am:
8091a00994 -s ours am:
bc12dda3a7 am:
ffe6090f7e am:
a71d1c416b am:
081bea189d -s ours
am:
34b14060c1
Change-Id: I017086383136e5a16bc5328046781bc584043f6c
Jaewan Kim [Thu, 22 Sep 2016 16:37:06 +0000 (16:37 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am:
64b7b1522e -s ours am:
5abd69e59a am:
f7f452fd28 am:
8a168a7c5d -s ours am:
298c104ae5 am:
d9e8bfb8cf am:
8cb7a9fdb0 am:
a13096f4c5 -s ours
am:
36aa253b2b
Change-Id: I93fc78c253458ec31b7ea34e34c3124bf7f557b7
Jaewan Kim [Thu, 22 Sep 2016 16:35:42 +0000 (16:35 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82 am:
64110c6bf1 -s ours am:
8d14f464b5 am:
f595add2ff am:
e1e6f0a7f5 am:
9632afe809 -s ours
am:
b96d410537
Change-Id: If9781b819c9baa55597daaf2ed03b2886739f56e
Jaewan Kim [Thu, 22 Sep 2016 16:34:39 +0000 (16:34 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours am:
91ccfa1def am:
4167620d33 am:
2c9ad0ff81 am:
b6d6519e34 -s ours
am:
61fda61d20
Change-Id: I9159be101773b421df3b23ec02d0f7ec8cb64b4a
Jaewan Kim [Thu, 22 Sep 2016 16:33:47 +0000 (16:33 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours am:
30d1440861 am:
ba1d8300be am:
016d110993 am:
1adff2ee05 -s ours
am:
78efad6418
Change-Id: I1eb3eba4342a7af62ebbc3a9f4e90e58b5adcac2
Ajay Panicker [Thu, 22 Sep 2016 16:32:31 +0000 (16:32 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97 am:
94c08c2bed -s ours am:
d4fe288933 am:
f65661939b am:
630d577349 am:
c9830d56e5 -s ours
am:
c5442c263a
Change-Id: Ib205c5e83f800dbb2a41b812fc0840f2b4029874
Ajay Panicker [Thu, 22 Sep 2016 16:31:34 +0000 (16:31 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976 am:
9c7ac98157 -s ours am:
1448a693d8 am:
3d4c737736 am:
f6d8037708 am:
90eafb5322 -s ours
am:
b2a1dcb913
Change-Id: I3b8c695133c8631e7f058b9fd26da13d69d23735
Ajay Panicker [Thu, 22 Sep 2016 16:30:28 +0000 (16:30 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b am:
852e5a43b9 -s ours am:
a70fffe8e7 am:
d677e8d413 am:
73607db5a1 am:
05cd9942d9 -s ours
am:
745254f98b
Change-Id: I35793a0332aaeb572a288d7806aed2bc43879dab
Jaewan Kim [Thu, 22 Sep 2016 16:06:27 +0000 (16:06 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours
am:
1c278e5652
Change-Id: I2486a6238a2595d7bd84b31916e22987ea2f98d5
Scott Main [Thu, 22 Sep 2016 15:22:38 +0000 (15:22 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
Ajay Panicker [Thu, 22 Sep 2016 14:48:37 +0000 (14:48 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours am:
7f84596929 -s ours am:
ed82c6fac8 am:
c1f8a09c1e am:
8091a00994 -s ours am:
bc12dda3a7 am:
ffe6090f7e am:
a71d1c416b
am:
081bea189d -s ours
Change-Id: Ic3f72935e96e7b6f7b3a69474451d3edd418dd24
Ajay Panicker [Thu, 22 Sep 2016 14:24:38 +0000 (14:24 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours
am:
9338ffa148
Change-Id: I92ec98b22ea071df0a24d19f8a6bb4523606089d
Jaewan Kim [Thu, 22 Sep 2016 14:23:38 +0000 (14:23 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours
am:
fa9983ec73
Change-Id: I5e9cb821711f13d536af5d3d5d42595f0e286559
OSDN Git Service
