Joe Fernandez
e94aefcaa3
am b456104d: am 774e3418: am cf657324: am c9b5f98b: am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc
...
* commit 'b456104d9f8ff0dba77f80f7e5e23753d58716a2':
docs: remove reference to GCM doc from C2DM doc
2015-02-19 01:21:13 +00:00
Robert Greenwalt
39bb5a40c0
am add933f2: am b4a3edac: am e460f88d: Merge "Support single PDP network for Unite operator of Moldova"
...
* commit 'add933f29d060403df25f111051a46a28ab5b141':
Support single PDP network for Unite operator of Moldova
2015-02-19 01:11:46 +00:00
Joe Fernandez
b456104d9f
am 774e3418: am cf657324: am c9b5f98b: am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc
...
* commit '774e3418c4433e1a5bc6c22c6fa6b4968c9fb696':
docs: remove reference to GCM doc from C2DM doc
2015-02-19 01:06:46 +00:00
Wale Ogunwale
9176a30d36
Merge "Set compatInfo to default if unset in ContextImpl constructor."
2015-02-19 01:05:29 +00:00
Joe Fernandez
774e3418c4
am cf657324: am c9b5f98b: am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc
...
* commit 'cf65732466e2dccf63575501fda18651d8ab19fc':
docs: remove reference to GCM doc from C2DM doc
2015-02-19 00:56:31 +00:00
Robert Greenwalt
add933f29d
am b4a3edac: am e460f88d: Merge "Support single PDP network for Unite operator of Moldova"
...
* commit 'b4a3edace75b00c9781af0b2b60dfc88c15fe350':
Support single PDP network for Unite operator of Moldova
2015-02-19 00:53:35 +00:00
Natalie Silvanovich
afea1cd265
am e902d0ff: (-s ours) am fe349a84: am 6f1eb5ba: am 0181b76b: am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
...
* commit 'e902d0ff11a000f79b363f9b0590bfd80dcc0bea':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
2015-02-19 00:53:20 +00:00
Joe Fernandez
cf65732466
am c9b5f98b: am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc
...
* commit 'c9b5f98bec64e52436c128e035558744c75ee2ef':
docs: remove reference to GCM doc from C2DM doc
2015-02-19 00:50:18 +00:00
Jeff Sharkey
e76432d715
Merge "Even more lint tests."
2015-02-19 00:49:38 +00:00
Robert Greenwalt
b4a3edace7
am e460f88d: Merge "Support single PDP network for Unite operator of Moldova"
...
* commit 'e460f88d37ce035718987b9424190956a6bba52f':
Support single PDP network for Unite operator of Moldova
2015-02-19 00:46:07 +00:00
Jeff Sharkey
90b547bb50
Even more lint tests.
...
Updated boolean set/get tests to handle isFoo() and hasFoo() style
methods.
When listeners are passed as method argument, they should come near
the end of the argument list.
Verify that resources are named consistently.
Slightly clearer message wording overall.
Change-Id: Id22947bd932d82222ce3e6c6e2012dade348fb56
2015-02-18 16:45:58 -08:00
Natalie Silvanovich
e902d0ff11
am fe349a84: am 6f1eb5ba: am 0181b76b: am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
...
* commit 'fe349a84213faa55730bbde4b9b61657bcf10ee0':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
2015-02-19 00:43:09 +00:00
Joe Fernandez
c9b5f98bec
am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc
...
* commit '6f5d4bd8c3f780744f0c739cbe168f764fbf824f':
docs: remove reference to GCM doc from C2DM doc
2015-02-19 00:42:50 +00:00
Robert Greenwalt
e460f88d37
Merge "Support single PDP network for Unite operator of Moldova"
2015-02-19 00:39:22 +00:00
Natalie Silvanovich
fe349a8421
am 6f1eb5ba: am 0181b76b: am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
...
* commit '6f1eb5bab9ea6f31b3a7243b6b3fecf9afeaa9c3':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
2015-02-19 00:36:59 +00:00
Joe Fernandez
6f5d4bd8c3
am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc
...
* commit 'de91b3842b71c5acc6ad49cc2504fc0ff0e7e3e3':
docs: remove reference to GCM doc from C2DM doc
2015-02-19 00:36:50 +00:00
Wale Ogunwale
9cf9954432
Set compatInfo to default if unset in ContextImpl constructor.
...
Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.
Bug: 19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
2015-02-18 16:31:34 -08:00
Joe Fernandez
de91b3842b
am e385672c: docs: remove reference to GCM doc from C2DM doc
...
* commit 'e385672c9cb7ad212a92b77f72974035812ae9f1':
docs: remove reference to GCM doc from C2DM doc
2015-02-19 00:30:32 +00:00
Natalie Silvanovich
6f1eb5bab9
am 0181b76b: am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
...
* commit '0181b76b7c822c9876d5c475a2393246d85db772':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
2015-02-19 00:23:22 +00:00
Joe Fernandez
e385672c9c
docs: remove reference to GCM doc from C2DM doc
...
Change-Id: Ic044916487d56bab22e30b24392890b97acf9d44
2015-02-18 16:16:43 -08:00
Natalie Silvanovich
0181b76b7c
am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
...
* commit 'bb4d0676fde95e68fc708d54499bb40c8fa7ccd3':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
2015-02-19 00:12:49 +00:00
Natalie Silvanovich
bb4d0676fd
am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
...
* commit '494d5b7757fab576facc5a7e923d2a15650dea1c':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
2015-02-19 00:05:53 +00:00
Natalie Silvanovich
494d5b7757
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
2015-02-19 00:02:31 +00:00
Rich Slogar
64d090d85a
am 93cd3929: am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
...
* commit '93cd3929ae757e499c13a03f575c4bd0721ac4b6':
docs: lint inspection updates
2015-02-18 23:50:14 +00:00
Rich Slogar
93cd3929ae
am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
...
* commit 'c905da575c422a3b905e116724a24c73bcf2d0b4':
docs: lint inspection updates
2015-02-18 23:43:29 +00:00
Rich Slogar
c905da575c
am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
...
* commit '5af2270b13d0edf33b0dd3e4bf84d0c6bed9de69':
docs: lint inspection updates
2015-02-18 23:36:44 +00:00
Rich Slogar
5af2270b13
am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
...
* commit 'cd9c0cab77ea635910591116e54932f727317923':
docs: lint inspection updates
2015-02-18 23:28:52 +00:00
Rich Slogar
cd9c0cab77
am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
...
* commit '708959b5326b7877553397fc17237e02f0d3adb1':
docs: lint inspection updates
2015-02-18 23:21:27 +00:00
Rich Slogar
708959b532
am 755c5d88: am 56375d90: docs: lint inspection updates
...
* commit '755c5d8806ac55e5a9dc9bd272408eaeb1bf1acd':
docs: lint inspection updates
2015-02-18 23:14:44 +00:00
Rich Slogar
755c5d8806
am 56375d90: docs: lint inspection updates
...
* commit '56375d90662041c3f3e98c6b77f5a3c3c506f43b':
docs: lint inspection updates
2015-02-18 23:07:50 +00:00
Rich Slogar
56375d9066
docs: lint inspection updates
...
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
2015-02-18 14:17:21 -08:00
Mohamad Ayyash
97ae891df2
Merge "AlsaCardsParser: Ensure line is not NULL when reading Cards File."
2015-02-18 21:31:38 +00:00
Adrian Roos
a187960989
Merge "Set the light status flag based on right window"
2015-02-18 20:37:57 +00:00
Mohamad Ayyash
f98e1c72fc
AlsaCardsParser: Ensure line is not NULL when reading Cards File.
...
Change-Id: I5136bbb776bbbf97229b2d96975b819a94232d66
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-02-18 12:35:48 -08:00
Tor Norbye
a42d2eaf2d
Merge "Add @ResourceInt annotations on APIs"
2015-02-18 19:24:01 +00:00
Adrian Roos
cd3884dfb2
Set the light status flag based on right window
...
The flag needs to be set based on the top window that is either
reaching beneath the status bar or is dimming.
Bug: 19233606
Change-Id: I7b97f6869e3b7d5ae2b7030122b311ee9e13871f
2015-02-18 20:09:42 +01:00
Chris Craik
fbf255125b
Merge "Glop text shadows, clearLayerRegions, and rectangleList"
2015-02-18 18:56:03 +00:00
Adrian Roos
7478de1e87
Merge "Decouple package manager lock and bitmap decoding"
2015-02-18 18:09:09 +00:00
Chris Craik
36a35e366a
Fix layer shader to store layer pointer
...
bug:19419672
Change-Id: I4277348ceab41fbf45a107a8b21f64e2b4af23e0
2015-02-18 17:47:21 +00:00
Adrian Roos
6c770900d6
Update strings for NetworkOverLimitActivity
...
Bug: 17073752
Change-Id: I5c4de380df7d3261d447725b83a777459cb3c44f
2015-02-18 17:02:10 +00:00
Kenny Guy
c627484653
Merge "Handle users being deleted in getUserHandle."
2015-02-18 16:56:52 +00:00
Geoff Mendal
52f6711233
Merge "Import translations. DO NOT MERGE"
2015-02-18 16:49:35 +00:00
John Spurlock
fadfc4e11b
Merge "Volume prototypes: Allow delegate volume UI to set remote controller."
2015-02-18 16:12:14 +00:00
Geoff Mendal
cff9a9c62c
Import translations. DO NOT MERGE
...
Change-Id: Idb44934688545ba6e85530cab1a3fd513ff5ec1f
Auto-generated-cl: translation import
2015-02-18 08:04:33 -08:00
Tor Norbye
7b9c912f53
Add @ResourceInt annotations on APIs
...
Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
2015-02-18 07:49:03 -08:00
Craig Mautner
2ada234d82
Merge "Refactor to split computeScreenConfigurationLocked"
2015-02-18 15:42:17 +00:00
Adrian Roos
44bc07d874
Fix typo
...
Change-Id: If59381862e3332675fd7b929bcee2928ecd0da21
2015-02-18 15:03:37 +00:00
Geoff Mendal
f9573360ee
Merge "Import translations. DO NOT MERGE"
2015-02-18 14:50:45 +00:00
Geoff Mendal
d10f927b68
Import translations. DO NOT MERGE
...
Change-Id: I1a52c8fef9730186416c08d59dff271e2af9c84a
Auto-generated-cl: translation import
2015-02-18 06:39:52 -08:00
Geoff Mendal
99bf808382
am 7c4c7c67: (-s ours) am 8bd345f9: (-s ours) am 4a71ff87: (-s ours) Import translations. DO NOT MERGE
...
* commit '7c4c7c67ef640e46d650a69715c53adeec8bd01f':
Import translations. DO NOT MERGE
2015-02-18 14:20:11 +00:00
