Mark Lu
|
7101d98f93
|
Merge "docs: improve docs for sqlite package summary" into nyc-dev am: 0a544fa4a7 am: 0be2abbce1
am: 6cb04e103b
Change-Id: I413a0a7d4f14855274550036a9f47e0ff4efcce2
|
2016-09-26 17:55:16 +00:00 |
|
Mark Lu
|
c17e4ffff3
|
Merge "docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32" into nyc-mr1-dev-plus-aosp
am: e19dac286d
Change-Id: Id32e000e3863a72fea8e8fcf4d1508ba3a839d0b
|
2016-09-26 17:53:24 +00:00 |
|
Mark Lu
|
b920dc4968
|
docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32
am: 2f90f2c53a
Change-Id: I2f7c459d979e802996e60611c678c3dbf9ab2b3f
|
2016-09-26 17:53:18 +00:00 |
|
Michael Wright
|
344b0fc9e3
|
Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6" into nyc-mr1-dev-plus-aosp
am: cba0f3e8e4
Change-Id: Iac624fee086201a6c634f92802011ab362fea8e1
|
2016-09-26 17:51:45 +00:00 |
|
Michael Wright
|
a2f01d0487
|
Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6
am: 804a1d266a
Change-Id: Ife535ae4d6854109a27b680f902b5fc0ace21db1
|
2016-09-26 17:51:41 +00:00 |
|
Mark Lu
|
05ff76aed5
|
Merge "Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf" into nyc-mr1-dev-plus-aosp
am: f0d2d9cffa
Change-Id: I3043b5ef827397b27f585e117764d7907915fcdf
|
2016-09-26 17:50:18 +00:00 |
|
Mark Lu
|
5518005f23
|
Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev am: b764c94a26 am: 8d7dfafadf
am: b5be488467
Change-Id: I957ce99d017edd8e965f9ce7c21c51af49cff968
|
2016-09-26 17:50:12 +00:00 |
|
Josh Horwich
|
7d1b14dedd
|
Merge "Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6" into nyc-mr1-dev-plus-aosp
am: b98f8235ea
Change-Id: Ia203ac58a195cf46ae63dccbd998e52c5c6c4cb5
|
2016-09-26 17:48:30 +00:00 |
|
Josh Horwich
|
af524b18a0
|
Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54 am: 3ecd86b7c6
am: 93da468b5f
Change-Id: I09ed95dfc7a8431f0eb3d9b798ddb8fa40069af2
|
2016-09-26 17:48:26 +00:00 |
|
Mark Lu
|
0980482524
|
Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6" into nyc-mr1-dev-plus-aosp
am: 5f71bfc72f
Change-Id: I74b290f3594b790b410a518e7be9b5436ecb6d0e
|
2016-09-26 17:46:31 +00:00 |
|
Mark Lu
|
1289f9919c
|
docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6
am: 901e97e133
Change-Id: Ife8ddd36653e9e336b7bcd3f2e6bab251f015021
|
2016-09-26 17:46:25 +00:00 |
|
Josh Horwich
|
07fff2f282
|
Merge "Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c am: 3818ca2a95" into nyc-mr1-dev-plus-aosp
am: 00fb6698f8
Change-Id: I1e6db89ea0151243d5031761e17f3ba751ed2bce
|
2016-09-26 17:44:56 +00:00 |
|
Josh Horwich
|
762e6aea8d
|
Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c am: 3818ca2a95
am: 4ab56579a5
Change-Id: I7f31122c96f0dce0934edaf143605f959e10a42a
|
2016-09-26 17:44:53 +00:00 |
|
Mark Lu
|
36cb0973b1
|
Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3 am: 3b4add4667
am: cb0c4c5d8a
Change-Id: I6fd46a546aa175e91fa0a08ea263849f112bf2f3
|
2016-09-26 17:40:06 +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 |
|
Michael Wright
|
17158c58c7
|
Merge "Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff" into nyc-mr1-dev-plus-aosp
am: 3e952acba8 -s ours
Change-Id: I9c401a409a5d9fb2154bfd088c42dd26d9514c0f
|
2016-09-26 17:35:34 +00:00 |
|
Michael Wright
|
52b1a7b7b8
|
Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff
am: 7a7a82c20d -s ours
Change-Id: Id67434e623de198b5f3917a4c246bd9b1a4e635e
|
2016-09-26 17:35:31 +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 |
|
Hemal Patel
|
94f938a56f
|
Fixed a typo in the code sample am: 247d1c9ea8 am: 9fa6e02d2d
am: 7829ef7cf0
Change-Id: Ic82a377c8d517c35697c1d27e038bbaec82c6598
|
2016-09-26 17:34:20 +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 |
|
Android Build Merger (Role)
|
5f71bfc72f
|
Merge "docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90 am: 5dc8052df6" into nyc-mr1-dev-plus-aosp
|
2016-09-26 17:33:19 +00:00 |
|
Josh Horwich
|
93da468b5f
|
Merge "Docs: Fix missing space" into nyc-dev am: fd0a31c0aa am: 70399b36ce am: 5ca7164e54
am: 3ecd86b7c6
Change-Id: Iecf109d7b37283f221bfebe263db563c9e0195dd
|
2016-09-26 17:32:53 +00:00 |
|
Mark Lu
|
901e97e133
|
docs: Update docs for SQLiteDatabase replace methods am: 1e20208d90
am: 5dc8052df6
Change-Id: I675b709d12581d9bb3c67b48eb3be9b7dcc75a88
|
2016-09-26 17:32:36 +00:00 |
|
Android Build Merger (Role)
|
00fb6698f8
|
Merge "Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c am: 3818ca2a95" into nyc-mr1-dev-plus-aosp
|
2016-09-26 17:32:35 +00:00 |
|
Josh Horwich
|
4ab56579a5
|
Docs: Fix missing space am: 999fe148e4 am: 0413b48aba am: 0f895d3d9c
am: 3818ca2a95
Change-Id: I5783931020c0bedeba5426b2a0ce4e8733f28fd7
|
2016-09-26 17:31:38 +00:00 |
|
Mark Lu
|
cb0c4c5d8a
|
Merge "Fixed a typo in the code sample" into nyc-dev am: 537481e2c3
am: 3b4add4667
Change-Id: Ia3afb8b76491531ba2ae4ec8a41850493299f930
|
2016-09-26 17:31:22 +00:00 |
|
Android Build Merger (Role)
|
3e952acba8
|
Merge "Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff" into nyc-mr1-dev-plus-aosp
|
2016-09-26 17:28:28 +00:00 |
|
Michael Wright
|
7a7a82c20d
|
Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67
am: ad5ef71eff
Change-Id: Ifcff1f271119ae23ef30b547ca77167dd76d1292
|
2016-09-26 17:27:40 +00:00 |
|
Hemal Patel
|
7829ef7cf0
|
Fixed a typo in the code sample am: 247d1c9ea8
am: 9fa6e02d2d
Change-Id: Ic7e084556e86ec99f01f7f5d6a423cb9c134ba73
|
2016-09-26 17:27:19 +00:00 |
|
Michael Wright
|
eb8253c70f
|
Merge "Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9" into nyc-mr1-dev-plus-aosp
am: 862fbe0828
Change-Id: I731331a312d5825ec50ab991df3e767eb6763924
|
2016-09-26 17:25:02 +00:00 |
|
Michael Wright
|
de8bdf349d
|
Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9
am: f573fcbd07
Change-Id: I4f7017a3ef31936c1b89f5821cd780ff831750f9
|
2016-09-26 17:24:57 +00:00 |
|
Mark Lu
|
0be2abbce1
|
Merge "docs: improve docs for sqlite package summary" into nyc-dev
am: 0a544fa4a7
Change-Id: Idd212c577fff4b6aa05dd14dfe77bddbb217b802
|
2016-09-26 17:24:09 +00:00 |
|
Mark Lu
|
195099dc32
|
docs: improve docs for sqlite package summary
am: 59640a9f1c
Change-Id: I9ec1851274071cb1882839df68e27d1c9b98f8f7
|
2016-09-26 17:24:06 +00:00 |
|
Mark Lu
|
8d7dfafadf
|
Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev
am: b764c94a26
Change-Id: I2a3b858efa1881cd455412a19a7cfb5f7786bd34
|
2016-09-26 17:22:48 +00:00 |
|
Mark Lu
|
5dc8052df6
|
docs: Update docs for SQLiteDatabase replace methods
am: 1e20208d90
Change-Id: I8222fae7025d5a546b0b3d6b0ebbb7abae66ba8b
|
2016-09-26 17:22:45 +00:00 |
|
TreeHugger Robot
|
862fbe0828
|
Merge "Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9" into nyc-mr1-dev-plus-aosp
|
2016-09-26 17:21:17 +00:00 |
|
Mark Lu
|
3b4add4667
|
Merge "Fixed a typo in the code sample" into nyc-dev
am: 537481e2c3
Change-Id: Iab4f3930c44319d1adba37b3798d133c57763102
|
2016-09-26 17:21:10 +00:00 |
|
Hemal Patel
|
9fa6e02d2d
|
Fixed a typo in the code sample
am: 247d1c9ea8
Change-Id: Ic07c17c95e29ce916e2cde22cbb0ce797f8c65fe
|
2016-09-26 17:21:04 +00:00 |
|
Michael Wright
|
994c5722d6
|
Disable battery saver when booting with sufficient battery
am: 2763c2ba6c
Change-Id: I7b94bc0ce1c370d456cc9275aa1067929d4d95d0
|
2016-09-26 17:21:00 +00:00 |
|
Michael Wright
|
f573fcbd07
|
Merge commit 'e022ea98ee6029f9431d7c33704fea71f9fd527f' into manual_merge_e022ea9
Change-Id: Ica939f489382b8e0fe9256ebda89f326aa197228
|
2016-09-26 18:15:18 +01:00 |
|
Mark Lu
|
0a544fa4a7
|
Merge "docs: improve docs for sqlite package summary" into nyc-dev
|
2016-09-26 17:12:51 +00:00 |
|
Mark Lu
|
b764c94a26
|
Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev
|
2016-09-26 17:12:32 +00:00 |
|
Mark Lu
|
537481e2c3
|
Merge "Fixed a typo in the code sample" into nyc-dev
|
2016-09-26 17:11:57 +00:00 |
|
TreeHugger Robot
|
82fac583a6
|
Merge "Custom pointer icon for DatePicker and TimePicker"
|
2016-09-26 17:05:45 +00:00 |
|
Etan Cohen
|
8b82662df2
|
Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 am: f95a3703c1 am: c83ae8d290
am: b041ae49d6
Change-Id: Ibd5e08c00a6ef753b4a5cac744c1a0119f88bc80
|
2016-09-26 17:04:25 +00:00 |
|