Commit Graph

277484 Commits

Author SHA1 Message Date
smain@google.com
a3252f103d revise Develop landing page banner for Studio 2.2
Change-Id: I7eec3b72d09b87a56dfebd5391f9eac55dc26853
2016-09-26 12:22:40 -07:00
TreeHugger Robot
72f2597b17 Merge "Increase priority for broadcast intent triggered by HW key" into nyc-mr1-dev 2016-09-26 19:20:41 +00:00
TreeHugger Robot
69bd04a6f0 Merge "Fixing drag/drop docs for DRAG_START." into nyc-mr1-dev 2016-09-26 19:19:41 +00:00
Etan Cohen
37db2fbfbd Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8 am: bc74135d6a
am: b319bc2bf7

Change-Id: Ib0d578323b719b90d3330993d61079dc3885bf52
2016-09-26 19:06:11 +00:00
Etan Cohen
b319bc2bf7 Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8
am: bc74135d6a

Change-Id: I1368c0bfe18415126924e13eebe30f9061ac5b41
2016-09-26 19:00:15 +00:00
Etan Cohen
bc74135d6a Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"
am: 88da460cd8

Change-Id: I9debe0bec7569a9acb83d431fc5863b5b9bb5690
2016-09-26 18:56:16 +00:00
smain@google.com
8ddfa9ccf6 update landing page banner for studio 2.2
Change-Id: Ibd22a8ac7e7d716ee169a6c8ddc67bb8f54e9337
2016-09-26 11:55:27 -07:00
Etan Cohen
41d6f375be [NAN] Fix incorrect log message
(cherry-pick of commit 0d7863406b)

Bug: 31678708
Test: integrated (sl4a) test
Change-Id: I822c66619642f08d1d8f68cc8257185360da60be
2016-09-26 11:53:28 -07:00
Etan Cohen
88da460cd8 Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" 2016-09-26 18:50:36 +00:00
Bill Yi
062640e874 Import translations. DO NOT MERGE
Change-Id: I40d04cd42a2528f3c8cd4f903f21499547bc742a
Auto-generated-cl: translation import
2016-09-26 11:49:48 -07:00
Michael Wright
806299e3a9 Merge "DO NOT MERGE Actually track generics in API definition." into nyc-mr1-dev-plus-aosp 2016-09-26 18:48:11 +00:00
Pankaj Kanwar
6d37ff1856 Merge "Prevent NPE if someone creates a bad BluetoothHealthAppConfig object" into nyc-mr1-dev am: fe8176bda7
am: d9a87423c7

Change-Id: I525b159f6533b948340d4e3c0c3b857d1b6b81a1
2016-09-26 18:38:50 +00:00
Michael Wright
091ffac018 DO NOT MERGE Actually track generics in API definition.
Bug: 24265043
Test: make
Change-Id: Id5544c0f0cf32655f9c00a5cc3eca1cabb70170f
2016-09-26 19:38:14 +01:00
Ajay Panicker
e6558c2a54 Prevent NPE if someone creates a bad BluetoothHealthAppConfig object am: 74fa2d6846
am: 26803036be

Change-Id: I4aa3f463b688f941817e6df4a16ff1036d7be8c5
2016-09-26 18:37:58 +00:00
Bill Yi
8385775f42 Import translations. DO NOT MERGE
Change-Id: Id818d9cae8ab34164496f8e9d2e8bdfeea6ce56b
Auto-generated-cl: translation import
2016-09-26 11:35:38 -07:00
Pankaj Kanwar
d9a87423c7 Merge "Prevent NPE if someone creates a bad BluetoothHealthAppConfig object" into nyc-mr1-dev
am: fe8176bda7

Change-Id: I893d607dae1a7dc85c1c13cd3ac9201d40c6a997
2016-09-26 18:32:25 +00:00
Ajay Panicker
26803036be Prevent NPE if someone creates a bad BluetoothHealthAppConfig object
am: 74fa2d6846

Change-Id: I4009d3fae047e80d0804a978acbea6aa0625ef75
2016-09-26 18:32:20 +00:00
Pankaj Kanwar
fe8176bda7 Merge "Prevent NPE if someone creates a bad BluetoothHealthAppConfig object" into nyc-mr1-dev 2016-09-26 18:24:38 +00:00
smain@google.com
d46b711d54 switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC am: 01569c41e7 am: 420ebe877d am: 1d8390ab68
am: 525de8d9da

Change-Id: Ie56a9b63a438731dca25037e290bc3327cd281fe
2016-09-26 18:01:00 +00:00
Mark Lu
00e0f8de06 Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 41ea66f1b8 am: 02e47a80c8
am: c5a829fff4

Change-Id: I7163f0af7b6213ed0476f0e9da75a2f1e57d028f
2016-09-26 17:57:00 +00:00
Mark Lu
e62e01a5f9 docs: improve docs for sqlite package summary am: 59640a9f1c am: e9480d08d3 am: fd4f71e3c3
am: 56ae75bd81

Change-Id: I7d6f6b7a14e8a1a78ea5038aaab16ec0502c0018
2016-09-26 17:55:51 +00:00
Mark Lu
60cecdf748 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: a96dec6a80 am: 4fe3d2380e
am: b2a58fe512

Change-Id: I12c690e95dd78b9623a4f601f1e9ea8af67f5a49
2016-09-26 17:54:52 +00:00
Mark Lu
355e889c12 docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 376f3e6b3a am: 33ec89cd65
am: ec58f6ef19

Change-Id: I9843485d299f830daf2d1034d03dae9057a7c8c7
2016-09-26 17:53:57 +00:00
Mark Lu
e5c7cd8f6b Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 am: d40a9f4c4e am: 0f31433733
am: 45fcddbd80

Change-Id: I3bb40b55d92b90ec5fb72f88a3d489927349072e
2016-09-26 17:53:03 +00:00
smain@google.com
525de8d9da switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC am: 01569c41e7 am: 420ebe877d
am: 1d8390ab68

Change-Id: I36a208744a3fd88e8c7de20754d1bd5ca43a5b4f
2016-09-26 17:52:08 +00:00
Hemal Patel
ca883d6b23 Fixed a typo in the code sample am: 247d1c9ea8 am: 6a400a5190 am: f6356ef3f6
am: 9d0da98c88

Change-Id: I1ce09d345f2ad93cc8e7d86b9592a361601c25dc
2016-09-26 17:51:51 +00:00
Vadim Tryshev
0f146711b7 Fixing drag/drop docs for DRAG_START.
The docs mentioned that only X coordinate was reported for
DRAG_START

Bug: 31702571
Change-Id: Id80360fe5f494b86ea47d7592c46dc9c884df932
2016-09-26 10:50:06 -07:00
Mark Lu
c5a829fff4 Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 41ea66f1b8
am: 02e47a80c8

Change-Id: Id5b0c4b578abac2a765e85ee5fe528c48927370d
2016-09-26 17:48:22 +00:00
Mark Lu
56ae75bd81 docs: improve docs for sqlite package summary am: 59640a9f1c am: e9480d08d3
am: fd4f71e3c3

Change-Id: I87bddc7048ca2c5d086662d2d258060905ebc8e6
2016-09-26 17:47:26 +00:00
Mark Lu
b2a58fe512 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: a96dec6a80
am: 4fe3d2380e

Change-Id: I2905bc4fcc0d61d6545a64c3e8ec0a647603450b
2016-09-26 17:46:18 +00:00
Mark Lu
ec58f6ef19 docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 376f3e6b3a
am: 33ec89cd65

Change-Id: I6a208d42360f716a921b740ed86ea420c987f624
2016-09-26 17:45:09 +00:00
Mark Lu
45fcddbd80 Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 am: d40a9f4c4e
am: 0f31433733

Change-Id: I708841e8ef53a99f113fff2d1d1fb0536190499f
2016-09-26 17:44:13 +00:00
Hemal Patel
9d0da98c88 Fixed a typo in the code sample am: 247d1c9ea8 am: 6a400a5190
am: f6356ef3f6

Change-Id: I04a154eeb1bcfdcc5ccfb934880df5bf2b10af41
2016-09-26 17:43:27 +00:00
Android Build Merger (Role)
720fe39c3c Merge changes from topic 'am-9d6b195743714d6486aa5f3d40a80546' into nyc-mr1-dev-plus-aosp
* changes:
  Merge "Change data usage alert/disabled messages." into nyc-mr1-dev am: 29678c0357 am: e62ab8a3b6
  Change data usage alert/disabled messages. am: 65ed8f9512 am: d7a14989a9
2016-09-26 17:42:47 +00:00
smain@google.com
1d8390ab68 switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC am: 01569c41e7
am: 420ebe877d

Change-Id: Ib9eb8105569220d1338b06676b69ae24cf7161c2
2016-09-26 17:42:44 +00:00
smain@google.com
9b15d59862 switch utm_medium to utm_source fix a couple hashes update the test recorder URL from TAC to DAC am: 01569c41e7
am: b893a93dc1

Change-Id: I88950b3c74a264e8e8faf299a368fd3f0a4e8ea4
2016-09-26 17:41:54 +00:00
Tyler Gunn
aa7137084b Merge "Change data usage alert/disabled messages." into nyc-mr1-dev am: 29678c0357
am: e62ab8a3b6

Change-Id: Ib0457e88dba5de996cc94fe0b1a5b0b43e5bf4f1
2016-09-26 17:40:43 +00:00
Tyler Gunn
5ea76c1b1b Change data usage alert/disabled messages. am: 65ed8f9512
am: d7a14989a9

Change-Id: I4d92b303caef169ce2747c5372a21f6551822ddb
2016-09-26 17:39:49 +00:00
Android Build Merger (Role)
bda2522438 Merge "Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3 am: 44d11d1328" into nyc-mr1-dev-plus-aosp 2016-09-26 17:39:29 +00:00
Mark Lu
02e47a80c8 Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7
am: 41ea66f1b8

Change-Id: Id429ceee33bb85df61df5c05b0781aff5ed27ace
2016-09-26 17:39:05 +00:00
Michael Wright
cd71b2b177 Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev am: 99ff7405a3
am: 44d11d1328

Change-Id: Ibaad489158ec1d1c815db0e8a182e76810e335a4
2016-09-26 17:38:42 +00:00
Android Build Merger (Role)
4581479302 Merge "Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 0be2abbce1" into nyc-mr1-dev-plus-aosp 2016-09-26 17:37:01 +00:00
Mark Lu
6cb04e103b Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7
am: 0be2abbce1

Change-Id: Idd8976b4327fcb99e8c661561d1ab6fe6a981902
2016-09-26 17:35:48 +00:00
Android Build Merger (Role)
e19dac286d Merge "docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32" into nyc-mr1-dev-plus-aosp 2016-09-26 17:35:30 +00:00
Android Build Merger (Role)
cba0f3e8e4 Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6" into nyc-mr1-dev-plus-aosp 2016-09-26 17:34:51 +00:00
Mark Lu
2f90f2c53a docs: improve docs for sqlite package summary am: 59640a9f1c
am: 195099dc32

Change-Id: I1adac6c932d1cc0d593c5cd29d8695c5b0836dff
2016-09-26 17:34:39 +00:00
Android Build Merger (Role)
f0d2d9cffa Merge "Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf" into nyc-mr1-dev-plus-aosp 2016-09-26 17:34:23 +00:00
Michael Wright
804a1d266a Disable battery saver when booting with sufficient battery am: 2763c2ba6c
am: 994c5722d6

Change-Id: I0f150a292f3e5415fe18dc54143dcd5bb0ee74b1
2016-09-26 17:33:59 +00:00
Android Build Merger (Role)
b98f8235ea Merge "Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6" into nyc-mr1-dev-plus-aosp 2016-09-26 17:33:38 +00:00
Mark Lu
b5be488467 Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26
am: 8d7dfafadf

Change-Id: I6f094eec9b028e3a1462a0ca4be63181104826b3
2016-09-26 17:33:35 +00:00