Kirill Grouchnikov
ede9ad62c8
Merge "Enforce the contract laid out in Javadocs"
2016-06-21 12:28:47 +00:00
Tony Mak
39fcc6acbc
Merge "Fix the handling of bundle array in RestrictionsManager"
2016-06-21 09:14:48 +00:00
Chris Banes
ae1f719ffc
Fix NPE in Toolbar - framework edition am: 3b925c1ab0
...
am: 09bf9e69bc
2016-06-21 08:21:35 +00:00
Chris Banes
09bf9e69bc
Fix NPE in Toolbar - framework edition
...
am: 3b925c1ab0
2016-06-21 08:16:28 +00:00
Chris Banes
3b925c1ab0
Fix NPE in Toolbar - framework edition
...
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.
BUG: 28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
2016-06-21 08:09:24 +00:00
Seigo Nonaka
6a643348de
Add test case for issue 29491345
...
Bug: 29491345
Change-Id: Icd7d1612ad317978356a17688d6ceb8b6a4825a8
2016-06-21 10:31:03 +09:00
Antonio Cansado
d3ae6a9c8e
Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: c20ffc2a9e am: 13cf0e7d54
...
am: 1d4fd3ed27
2016-06-20 22:44:51 +00:00
Antonio Cansado
1d4fd3ed27
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e
...
am: 13cf0e7d54
2016-06-20 22:36:49 +00:00
Roozbeh Pournader
2704d4ead1
Merge \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\" into nyc-mr1-dev
...
am: 55d9051e58
2016-06-20 22:33:29 +00:00
Antonio Cansado
13cf0e7d54
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
2016-06-20 22:29:49 +00:00
Antonio Cansado
43f0bd6e60
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
2016-06-20 22:29:45 +00:00
Antonio Cansado
c20ffc2a9e
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
2016-06-20 22:23:36 +00:00
Antonio Cansado
f704837429
Fix infinite loop when registering data usage callback.
...
Trivial fix is to call the method that takes the handler as a param.
Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Roozbeh Pournader
ad48dc18a5
Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"
...
This reverts commit e977b0ae59
2016-06-20 14:59:29 -07:00
Roozbeh Pournader
a1de63c871
Merge \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\" into nyc-dev am: 160126e2d8
...
am: 73939d8a60
2016-06-20 21:51:12 +00:00
Roozbeh Pournader
1f2f328025
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
...
am: 160126e2d8
2016-06-20 21:44:50 +00:00
Roozbeh Pournader
73939d8a60
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
...
am: 160126e2d8
2016-06-20 21:44:42 +00:00
Roozbeh Pournader
160126e2d8
Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev
2016-06-20 21:39:22 +00:00
Makoto Onuki
7e346ef853
Merge \\"Launcher shortcut callback should deliver manifest shortcuts too\\" into nyc-mr1-dev am: 901c03faba
...
am: c07a7518d6
2016-06-20 21:22:15 +00:00
Makoto Onuki
c07a7518d6
Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
...
am: 901c03faba
2016-06-20 21:15:26 +00:00
Makoto Onuki
901c03faba
Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev
2016-06-20 21:06:42 +00:00
TreeHugger Robot
c4e4a9a039
Merge "Add event tracking to print UI."
2016-06-20 20:57:36 +00:00
Adam Lesinski
8549988a89
Merge \\\"BatteryStats: record best estimated battery capacity\\\" into nyc-dev am: c2e06a55f9 am: a804fae3be
...
am: 0f7b0a8cc6
2016-06-20 20:05:22 +00:00
Adam Lesinski
0f7b0a8cc6
Merge \\"BatteryStats: record best estimated battery capacity\\" into nyc-dev am: c2e06a55f9
...
am: a804fae3be
2016-06-20 20:00:07 +00:00
Adam Lesinski
145e50243e
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
Adam Lesinski
a804fae3be
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
2016-06-20 19:49:46 +00:00
Tony Mak
1d18efe080
Fix the handling of bundle array in RestrictionsManager
...
Fix: 29506624
Change-Id: I0683d406f8b70d5d5f78bfc337d3952b6513d102
2016-06-20 19:41:08 +00:00
Roozbeh Pournader
d8914879b5
Merge \\"Fix AAPT-compatible output format for locales\\" into nyc-mr1-dev am: 63ed39f395
...
am: e7978c11c8
2016-06-20 19:38:05 +00:00
Roozbeh Pournader
e7978c11c8
Merge \"Fix AAPT-compatible output format for locales\" into nyc-mr1-dev
...
am: 63ed39f395
2016-06-20 19:27:50 +00:00
Roozbeh Pournader
63ed39f395
Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev
2016-06-20 19:22:27 +00:00
Todd Kennedy
7182948b56
Merge \"Merge \\"fix resolver\\" into nyc-mr1-dev am: acc21f572d\" into nyc-mr1-dev-plus-aosp
...
am: 3e68026036
2016-06-20 19:12:31 +00:00
Todd Kennedy
fcb121216c
Merge \"fix resolver\" into nyc-mr1-dev
...
am: acc21f572d
2016-06-20 19:06:15 +00:00
Adrian Roos
53fe1b98fd
Merge \"Merge \\"Enable tap-to-pulse only when needed\\" into nyc-mr1-dev am: d94a40f46d\" into nyc-mr1-dev-plus-aosp
...
am: 6ffddc03b7
2016-06-20 18:52:06 +00:00
Gustav Sennton
4f113f47df
Merge \\\"Use newly fetched PackageInfo for loading WebView code.\\\" into nyc-dev am: cdbf412f8e am: deac870fd1
...
am: 90888027d8
2016-06-20 18:52:02 +00:00
Philip P. Moltmann
2e3012624b
Add event tracking to print UI.
...
Bug: 29391676
Change-Id: Iec09ac7296e50329e87268bcb70f5e60d566961c
2016-06-20 11:50:44 -07:00
TreeHugger Robot
acc21f572d
Merge "fix resolver" into nyc-mr1-dev
2016-06-20 18:45:04 +00:00
Christopher Tate
4764689d23
Merge \\\"Let bmgr inspect the set of whitelisted transports\\\" into nyc-dev am: 0f101342e1 am: 0754128dc9
...
am: 24c08b27ef
2016-06-20 18:33:17 +00:00
Android Build Merger (Role)
6ffddc03b7
Merge "Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev am: d94a40f46d" into nyc-mr1-dev-plus-aosp
2016-06-20 18:28:42 +00:00
Adrian Roos
531c90e38d
Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev
...
am: d94a40f46d
2016-06-20 18:27:54 +00:00
Gustav Sennton
90888027d8
Merge \\"Use newly fetched PackageInfo for loading WebView code.\\" into nyc-dev am: cdbf412f8e
...
am: deac870fd1
2016-06-20 18:27:32 +00:00
Android Build Merger (Role)
6806472ab9
Merge "Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev am: cdbf412f8e" into nyc-mr1-dev
2016-06-20 18:23:48 +00:00
Gustav Sennton
deac870fd1
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
2016-06-20 18:23:44 +00:00
Gustav Sennton
47b391cf1d
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
2016-06-20 18:23:26 +00:00
Trevor Bunker
d94a40f46d
Merge "Enable tap-to-pulse only when needed" into nyc-mr1-dev
2016-06-20 18:23:18 +00:00
Gustav Sennton
cdbf412f8e
Merge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev
2016-06-20 18:17:06 +00:00
Adam Lesinski
f9b20a9ec4
BatteryStats: record best estimated battery capacity
...
Using the coulomb counter, record the estimated max battery
capacity.
Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
2016-06-20 10:58:37 -07:00
Christine Hallstrom
955f8ab45c
Merge \\"Fix early termination of while loop in BluetoothSocket#write\\" into nyc-mr1-dev am: ac1873b2fc
...
am: eb7dc19a1a
2016-06-20 17:54:57 +00:00
Andrew Sapperstein
bbfcc07976
Merge \\"Use colorAccent for fullscreen tutorial.\\" into nyc-mr1-dev am: 5494983425
...
am: 040c264bbb
2016-06-20 17:54:54 +00:00
Chris Tate
24c08b27ef
Merge \\"Let bmgr inspect the set of whitelisted transports\\" into nyc-dev am: 0f101342e1
...
am: 0754128dc9
2016-06-20 17:54:15 +00:00
