Kevin Hufnagle
e714ef3396
Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: b9db19de6a am: 0df906d279" into oc-mr1-dev-plus-aosp
...
am: cff0fad96c
2017-08-17 00:53:04 +00:00
Kevin Hufnagle
be25fc4240
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79 am: 9c43a77971
...
am: 817b77489c
2017-08-17 00:49:26 +00:00
Cindy Kuang
d67984ebfb
Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 3311ba316a" into oc-mr1-dev am: 56891ed4d4
...
am: f0b9ef7714
2017-08-17 00:44:17 +00:00
Bryce Lee
a7ec0565c6
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev am: 92a84efba1
...
am: a0cc0c5c90
2017-08-17 00:39:20 +00:00
Cindy Kuang
0a3fbdd830
Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 3311ba316a am: 1181c6895c" into oc-mr1-dev-plus-aosp
...
am: 7655076954
2017-08-17 00:31:23 +00:00
TreeHugger Robot
827e31f841
Merge "AAPT2: Add a APK filtering."
2017-08-16 23:55:16 +00:00
TreeHugger Robot
abe61c2a47
Merge "Add deltaX/Y to a11y scroll events"
2017-08-16 23:33:09 +00:00
TreeHugger Robot
07ea63bf83
Merge "Remove mSeen from AccessPoint."
2017-08-16 22:39:04 +00:00
Todd Kennedy
519b589300
resolve merge conflicts of d22603ebd2 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6
2017-08-16 15:00:20 -07:00
Cindy Kuang
fcd086e577
Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 1ed1ee3c70 am: 735aa14f4e" into oc-mr1-dev-plus-aosp
...
am: 91f0c696da
2017-08-16 20:46:40 +00:00
Jason Monk
3f7868cc8e
Merge "Merge "Protect against weak pointer crash." into oc-mr1-dev am: 0480580696" into oc-mr1-dev-plus-aosp
...
am: 67d205c3ab
2017-08-16 20:40:40 +00:00
Bill Yi
762635c0c2
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 175e8784dd -s ours" into oc-mr1-dev-plus-aosp
...
am: 479b072364
2017-08-16 20:35:41 +00:00
Fan Zhang
fc038de2b9
Merge "Add metrics constant for feature flag UI"
2017-08-16 20:27:22 +00:00
Di Lu
ccc8229e30
Merge "Merge "Add user quota information into the IpSecService dump" am: fedd856546 am: 5bef43fb64 am: 759696c47c am: 7745a7975f" into oc-mr1-dev-plus-aosp
...
am: c07d76a77b
2017-08-16 20:22:28 +00:00
Bill Yi
ef5cc26c47
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2bf548f090 -s ours
...
am: 5ef3328a09
2017-08-16 20:17:53 +00:00
Bill Yi
373961cdfc
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6d76d24b4e -s ours
...
am: 5e36c3d381
2017-08-16 20:12:17 +00:00
Bill Yi
cb4c0af58b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: d3ad51ae77 -s ours
...
am: 242c84fa25
2017-08-16 20:07:08 +00:00
Android Build Merger (Role)
c17f8d9967
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 41454e6f4d -s ours am: b3efadb4b2 -s ours"
2017-08-16 20:02:37 +00:00
Bill Yi
cdced530c6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 41454e6f4d -s ours
...
am: b3efadb4b2
2017-08-16 19:58:37 +00:00
Android Build Merger (Role)
34730182c9
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3945ba7f7b -s ours am: 90443216ec -s ours"
2017-08-16 19:58:20 +00:00
Bill Yi
61ed2d5461
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3945ba7f7b -s ours
...
am: 90443216ec
2017-08-16 19:54:51 +00:00
Android Build Merger (Role)
df68a50dd6
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6ccc89cb13 -s ours am: 2eb13c7a73 -s ours"
2017-08-16 19:54:27 +00:00
Bill Yi
c54bcf0a3e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6ccc89cb13 -s ours
...
am: 2eb13c7a73
2017-08-16 19:50:08 +00:00
Android Build Merger (Role)
339dc8f123
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2f317914e9 -s ours am: 76ae5a498d -s ours"
2017-08-16 19:49:49 +00:00
Bill Yi
f342a1f084
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2f317914e9 -s ours
...
am: 76ae5a498d
2017-08-16 19:46:39 +00:00
Android Build Merger (Role)
69787560d8
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c1bea24f38 -s ours am: 3da6753edf -s ours"
2017-08-16 19:46:20 +00:00
Bill Yi
94f18fab3d
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c1bea24f38 -s ours
...
am: 3da6753edf
2017-08-16 19:41:19 +00:00
Android Build Merger (Role)
8a80a46a6b
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6d995219d9 -s ours" into oc-mr1-dev-plus-aosp am: 2eb12cad3f -s ours"
2017-08-16 19:40:57 +00:00
Bill Yi
56889434fb
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6d995219d9 -s ours" into oc-mr1-dev-plus-aosp
...
am: 2eb12cad3f
2017-08-16 19:36:02 +00:00
Android Build Merger (Role)
ffdd778d35
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: b3f67e12be -s ours" into oc-mr1-dev-plus-aosp am: efdc17e95a -s ours"
2017-08-16 19:34:25 +00:00
Android Build Merger (Role)
cff0fad96c
Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: b9db19de6a am: 0df906d279" into oc-mr1-dev-plus-aosp
2017-08-16 19:33:47 +00:00
Bill Yi
c470adf056
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: b3f67e12be -s ours" into oc-mr1-dev-plus-aosp
...
am: efdc17e95a
2017-08-16 19:28:57 +00:00
Android Build Merger (Role)
9a13a242bc
Merge "Merge "Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310 am: e9291de0c4" into oc-mr1-dev-plus-aosp am: 4351aecb2d"
2017-08-16 19:28:20 +00:00
Kevin Hufnagle
817b77489c
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79
...
am: 9c43a77971
2017-08-16 19:26:45 +00:00
Kevin Hufnagle
2f95e229b7
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: b9db19de6a
...
am: 0df906d279
2017-08-16 19:26:43 +00:00
Hugo Benichi
b5c5b9d36c
Merge "Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310 am: e9291de0c4" into oc-mr1-dev-plus-aosp
...
am: 4351aecb2d
2017-08-16 19:22:46 +00:00
Android Build Merger (Role)
04bedb1231
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: eb4138e7e4 -s ours am: c8cb7b107f -s ours"
2017-08-16 19:21:58 +00:00
Shane Farmer
0a5b201156
AAPT2: Add a APK filtering.
...
Allow resource files to be removed from the final artifact based on the
density and locale configuration in the config file. The APK is split
along the density, locale and ABI axis. Each split is generated from the
original APK without modifying the original. The new resource table is
written back to the file system with unneeded assets etc removed.
Test: Unit tests
Test: Manually run optimize command against an APK and inspect results
Test: Installed split searchlite APK (after resigning) and ran on N6
Change-Id: If73597dcfd88c02d2616518585d0e25a5c6a84d1
2017-08-16 19:19:54 +00:00
Bill Yi
386a5ec2c8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: eb4138e7e4 -s ours
...
am: c8cb7b107f
2017-08-16 19:16:58 +00:00
Android Build Merger (Role)
8dbbdf0c37
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1c40c7077 -s ours am: 965d21f56b -s ours"
2017-08-16 19:16:38 +00:00
Kevin Hufnagle
0df906d279
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5
...
am: b9db19de6a
2017-08-16 19:16:12 +00:00
Kevin Hufnagle
9c43a77971
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5
...
am: d6d6d2cf79
2017-08-16 19:16:10 +00:00
Bill Yi
da4166849f
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1c40c7077 -s ours
...
am: 965d21f56b
2017-08-16 19:11:40 +00:00
Charles He
1af40a942b
Merge "Unbreak VPN unit tests."
2017-08-16 19:05:49 +00:00
Ben Wagner
e3d4a14380
Merge "Replace SkFAIL with SK_ABORT."
2017-08-16 19:03:38 +00:00
Kevin Hufnagle
d6d6d2cf79
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
...
am: 80376a98a5
2017-08-16 19:01:36 +00:00
Kevin Hufnagle
b9db19de6a
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
...
am: 80376a98a5
2017-08-16 19:01:35 +00:00
Android Build Merger (Role)
a22e619545
Merge "Merge "PackageManagerService: Change getCompressedFiles to reflect the new layout." into oc-mr1-dev am: 169a65169d am: 51432796dd"
2017-08-16 18:58:47 +00:00
Narayan Kamath
dfff1c7723
Merge "PackageManagerService: Change getCompressedFiles to reflect the new layout." into oc-mr1-dev am: 169a65169d
...
am: 51432796dd
2017-08-16 18:52:58 +00:00
Android Build Merger (Role)
dd55bbfb07
Merge "Merge "Fix issue when launching Camera" into oc-mr1-dev am: 5737af21cb am: b0c8653427"
2017-08-16 18:52:02 +00:00
