OSDN Git Service
Joe Fernandez [Thu, 19 Feb 2015 01:21:13 +0000 (01:21 +0000)]
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
Robert Greenwalt [Thu, 19 Feb 2015 01:11:46 +0000 (01:11 +0000)]
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
Joe Fernandez [Thu, 19 Feb 2015 01:06:46 +0000 (01:06 +0000)]
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
Wale Ogunwale [Thu, 19 Feb 2015 01:05:28 +0000 (01:05 +0000)]
Merge "Set compatInfo to default if unset in ContextImpl constructor."
Joe Fernandez [Thu, 19 Feb 2015 00:56:31 +0000 (00:56 +0000)]
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
Robert Greenwalt [Thu, 19 Feb 2015 00:53:35 +0000 (00:53 +0000)]
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
Natalie Silvanovich [Thu, 19 Feb 2015 00:53:20 +0000 (00:53 +0000)]
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
Joe Fernandez [Thu, 19 Feb 2015 00:50:18 +0000 (00:50 +0000)]
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
Jeff Sharkey [Thu, 19 Feb 2015 00:49:36 +0000 (00:49 +0000)]
Merge "Even more lint tests."
Robert Greenwalt [Thu, 19 Feb 2015 00:46:07 +0000 (00:46 +0000)]
am
e460f88d: Merge "Support single PDP network for Unite operator of Moldova"
* commit '
e460f88d37ce035718987b9424190956a6bba52f':
Support single PDP network for Unite operator of Moldova
Jeff Sharkey [Thu, 19 Feb 2015 00:45:54 +0000 (16:45 -0800)]
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
Natalie Silvanovich [Thu, 19 Feb 2015 00:43:09 +0000 (00:43 +0000)]
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
Joe Fernandez [Thu, 19 Feb 2015 00:42:50 +0000 (00:42 +0000)]
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
Robert Greenwalt [Thu, 19 Feb 2015 00:39:21 +0000 (00:39 +0000)]
Merge "Support single PDP network for Unite operator of Moldova"
Natalie Silvanovich [Thu, 19 Feb 2015 00:36:59 +0000 (00:36 +0000)]
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
Joe Fernandez [Thu, 19 Feb 2015 00:36:50 +0000 (00:36 +0000)]
am
de91b384: am
e385672c: docs: remove reference to GCM doc from C2DM doc
* commit '
de91b3842b71c5acc6ad49cc2504fc0ff0e7e3e3':
docs: remove reference to GCM doc from C2DM doc
Wale Ogunwale [Thu, 19 Feb 2015 00:31:34 +0000 (16:31 -0800)]
Set compatInfo to default if unset in ContextImpl constructor.
Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.
Bug:
19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
Joe Fernandez [Thu, 19 Feb 2015 00:30:32 +0000 (00:30 +0000)]
am
e385672c: docs: remove reference to GCM doc from C2DM doc
* commit '
e385672c9cb7ad212a92b77f72974035812ae9f1':
docs: remove reference to GCM doc from C2DM doc
Natalie Silvanovich [Thu, 19 Feb 2015 00:23:22 +0000 (00:23 +0000)]
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
Joe Fernandez [Thu, 19 Feb 2015 00:16:43 +0000 (16:16 -0800)]
docs: remove reference to GCM doc from C2DM doc
Change-Id: Ic044916487d56bab22e30b24392890b97acf9d44
Natalie Silvanovich [Thu, 19 Feb 2015 00:12:49 +0000 (00:12 +0000)]
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
Natalie Silvanovich [Thu, 19 Feb 2015 00:05:53 +0000 (00:05 +0000)]
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
Natalie Silvanovich [Thu, 19 Feb 2015 00:02:30 +0000 (00:02 +0000)]
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
Rich Slogar [Wed, 18 Feb 2015 23:50:14 +0000 (23:50 +0000)]
am
93cd3929: am
c905da57: am
5af2270b: am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
93cd3929ae757e499c13a03f575c4bd0721ac4b6':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:43:29 +0000 (23:43 +0000)]
am
c905da57: am
5af2270b: am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
c905da575c422a3b905e116724a24c73bcf2d0b4':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:36:44 +0000 (23:36 +0000)]
am
5af2270b: am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
5af2270b13d0edf33b0dd3e4bf84d0c6bed9de69':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:28:52 +0000 (23:28 +0000)]
am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
cd9c0cab77ea635910591116e54932f727317923':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:21:27 +0000 (23:21 +0000)]
am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
708959b5326b7877553397fc17237e02f0d3adb1':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:14:44 +0000 (23:14 +0000)]
am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
755c5d8806ac55e5a9dc9bd272408eaeb1bf1acd':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:07:50 +0000 (23:07 +0000)]
am
56375d90: docs: lint inspection updates
* commit '
56375d90662041c3f3e98c6b77f5a3c3c506f43b':
docs: lint inspection updates
Rich Slogar [Wed, 7 Jan 2015 21:52:12 +0000 (13:52 -0800)]
docs: lint inspection updates
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
Mohamad Ayyash [Wed, 18 Feb 2015 21:31:37 +0000 (21:31 +0000)]
Merge "AlsaCardsParser: Ensure line is not NULL when reading Cards File."
Adrian Roos [Wed, 18 Feb 2015 20:37:55 +0000 (20:37 +0000)]
Merge "Set the light status flag based on right window"
Mohamad Ayyash [Wed, 18 Feb 2015 20:16:17 +0000 (12:16 -0800)]
AlsaCardsParser: Ensure line is not NULL when reading Cards File.
Change-Id: I5136bbb776bbbf97229b2d96975b819a94232d66
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Tor Norbye [Wed, 18 Feb 2015 19:23:59 +0000 (19:23 +0000)]
Merge "Add @ResourceInt annotations on APIs"
Adrian Roos [Wed, 18 Feb 2015 16:25:23 +0000 (17:25 +0100)]
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
Chris Craik [Wed, 18 Feb 2015 18:56:02 +0000 (18:56 +0000)]
Merge "Glop text shadows, clearLayerRegions, and rectangleList"
Adrian Roos [Wed, 18 Feb 2015 18:09:08 +0000 (18:09 +0000)]
Merge "Decouple package manager lock and bitmap decoding"
Chris Craik [Wed, 18 Feb 2015 17:24:33 +0000 (09:24 -0800)]
Fix layer shader to store layer pointer
bug:
19419672
Change-Id: I4277348ceab41fbf45a107a8b21f64e2b4af23e0
Adrian Roos [Mon, 24 Nov 2014 13:01:30 +0000 (14:01 +0100)]
Update strings for NetworkOverLimitActivity
Bug:
17073752
Change-Id: I5c4de380df7d3261d447725b83a777459cb3c44f
Kenny Guy [Wed, 18 Feb 2015 16:56:50 +0000 (16:56 +0000)]
Merge "Handle users being deleted in getUserHandle."
Geoff Mendal [Wed, 18 Feb 2015 16:49:34 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE"
John Spurlock [Wed, 18 Feb 2015 16:12:13 +0000 (16:12 +0000)]
Merge "Volume prototypes: Allow delegate volume UI to set remote controller."
Geoff Mendal [Wed, 18 Feb 2015 16:04:33 +0000 (08:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idb44934688545ba6e85530cab1a3fd513ff5ec1f
Auto-generated-cl: translation import
Tor Norbye [Thu, 30 May 2013 23:48:33 +0000 (16:48 -0700)]
Add @ResourceInt annotations on APIs
Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
Craig Mautner [Wed, 18 Feb 2015 15:42:16 +0000 (15:42 +0000)]
Merge "Refactor to split computeScreenConfigurationLocked"
Adrian Roos [Wed, 11 Feb 2015 15:20:26 +0000 (16:20 +0100)]
Fix typo
Change-Id: If59381862e3332675fd7b929bcee2928ecd0da21
Geoff Mendal [Wed, 18 Feb 2015 14:50:44 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Feb 2015 14:39:52 +0000 (06:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a52c8fef9730186416c08d59dff271e2af9c84a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Feb 2015 14:20:11 +0000 (14:20 +0000)]
am
7c4c7c67: (-s ours) am
8bd345f9: (-s ours) am
4a71ff87: (-s ours) Import translations. DO NOT MERGE
* commit '
7c4c7c67ef640e46d650a69715c53adeec8bd01f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:14:01 +0000 (14:14 +0000)]
am
8bd345f9: (-s ours) am
4a71ff87: (-s ours) Import translations. DO NOT MERGE
* commit '
8bd345f90d27d88a7929b874efd6fa57c0c38146':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:07:41 +0000 (14:07 +0000)]
am
4a71ff87: (-s ours) Import translations. DO NOT MERGE
* commit '
4a71ff87b17acd54806a03f56bd1febdab7a4554':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:02:44 +0000 (14:02 +0000)]
am
c0334c7b: (-s ours) am
73087515: (-s ours) Import translations. DO NOT MERGE
* commit '
c0334c7b44b898095b37c2b2f2217bf13d59b96b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:00:48 +0000 (06:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec9356f31dd078b9bcff76203229ea03451487aa
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Feb 2015 13:55:43 +0000 (13:55 +0000)]
am
73087515: (-s ours) Import translations. DO NOT MERGE
* commit '
73087515174b537fe94fbd4efe480be1ac04872f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 13:47:24 +0000 (05:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic7373e3d8859d80c1472906c39ec46626b569c1b
Auto-generated-cl: translation import
Kenny Guy [Wed, 18 Feb 2015 12:22:44 +0000 (12:22 +0000)]
Merge "Remove widgets for packages no longer whitelisted by admin"
Jorim Jaggi [Wed, 18 Feb 2015 11:52:20 +0000 (11:52 +0000)]
Merge "Add theme for light status bar"
Christopher Tate [Wed, 18 Feb 2015 11:39:01 +0000 (11:39 +0000)]
Rich Slogar [Wed, 18 Feb 2015 11:37:57 +0000 (11:37 +0000)]
am
27672017: am
6b5c3802: am
c9cc2c22: am
bd1fb402: am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge:
0f60943
* commit '
27672017956f5bb672cab15d0f0094018b6fa9d9':
docs: note to install linux packages
Chris Banes [Wed, 18 Feb 2015 11:32:48 +0000 (11:32 +0000)]
resolved conflicts for merge of
cbc1ac33 to master
Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6
Andrew Solovay [Wed, 18 Feb 2015 11:13:30 +0000 (11:13 +0000)]
am
875b278c: am
6d6d0f91: am
46e881de: am
4eb14e02: am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge:
8d5ba01
* commit '
875b278c75de654d24224858aab3a6863540e319':
docs: Noted that purchaseToken is long and cannot be truncated.
Rich Sloager [Wed, 18 Feb 2015 11:13:23 +0000 (11:13 +0000)]
am
85b066cb: am
821bb7fd: am
3a69c24f: am
dcf68e83: am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge:
d225cfc
* commit '
85b066cb8a760ad1a20f7f758c3b7947aea96231':
Revert "docs: studio proxy setup"
Rich Slogar [Wed, 18 Feb 2015 11:13:15 +0000 (11:13 +0000)]
am
e9d86f58: am
9f807e7e: am
6de1fd98: am
502f303c: am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge:
797c989
* commit '
e9d86f585399c69d8930b7cdfb0464f0ddd5f49a':
docs: site mipmap folder updates
Chris Banes [Wed, 18 Feb 2015 11:02:49 +0000 (11:02 +0000)]
resolved conflicts for merge of
1c131eeb to master
Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
Svetoslav [Wed, 18 Feb 2015 05:42:53 +0000 (05:42 +0000)]
Merge "Location settings not properly set."
Svetoslav [Wed, 18 Feb 2015 05:37:09 +0000 (21:37 -0800)]
Location settings not properly set.
Settings provider has special handling for location providers. The
code to set the location providers was calling itself recursively
instead of updating the setting value.
bug:
19361236
Change-Id: I1ef1932c7faa8226b52123aa3f23f38048258328
Wale Ogunwale [Wed, 18 Feb 2015 03:23:36 +0000 (03:23 +0000)]
Merge "Fixed NPE in ResourceManager when Activity.recreate is called."
Svetoslav [Wed, 18 Feb 2015 02:36:12 +0000 (02:36 +0000)]
Merge "Remove unnecessary volume validators"
Svetoslav [Wed, 18 Feb 2015 02:20:29 +0000 (18:20 -0800)]
Remove unnecessary volume validators
Change-Id: I5f13016fa23978c8d35e9b85ec0ebecdf40a3d74
Christopher Tate [Wed, 18 Feb 2015 02:23:06 +0000 (02:23 +0000)]
am
8cd95aba: am
56238eaa: am
129ea76a: Fix wifi AP backup
* commit '
8cd95aba2f97eb552d437c185b156ba964886a6e':
Fix wifi AP backup
Christopher Tate [Wed, 18 Feb 2015 02:17:57 +0000 (02:17 +0000)]
am
56238eaa: am
129ea76a: Fix wifi AP backup
* commit '
56238eaaa3688c9a9858058f4dc63aade7092d9b':
Fix wifi AP backup
Christopher Tate [Wed, 18 Feb 2015 02:07:55 +0000 (02:07 +0000)]
am
129ea76a: Fix wifi AP backup
* commit '
129ea76a4a129fb3e8e997e8c604c0712e8a9d73':
Fix wifi AP backup
Chris Craik [Wed, 18 Feb 2015 00:42:02 +0000 (16:42 -0800)]
Glop text shadows, clearLayerRegions, and rectangleList
Change-Id: I83b36d1ee5d8f05f41acf244639019f9b8da79cd
Jeff Sharkey [Wed, 18 Feb 2015 01:22:47 +0000 (01:22 +0000)]
Merge "More lint tests."
Jeff Sharkey [Wed, 18 Feb 2015 01:19:41 +0000 (17:19 -0800)]
More lint tests.
When overloading methods, verify that common arguments always come
first and have consistent ordering.
When methods register listeners or callbacks (outside of the UI
toolkit), verify that an overload exists that takes a Handler to
deliver events through.
When a method accepts a Context argument, it must be the first
argument.
Change-Id: I6a6f94a3a0a8c48987835e47eb87564e569db2af
Christopher Tate [Wed, 18 Feb 2015 01:04:01 +0000 (17:04 -0800)]
Fix wifi AP backup
An OutputStream buffers only by explicit contract. OutputStreamWriter
buffers internally, always. Do not get these behaviors confused.
Bug
19341967
Change-Id: I0610ed625b0175620083dd286f3a73c24956b171
Craig Mautner [Tue, 17 Feb 2015 15:30:00 +0000 (07:30 -0800)]
Refactor to split computeScreenConfigurationLocked
Split into two methods, one that updates the Display and
another that updates the Configuration.
Change-Id: I7b503311da5bfddea2650cdb7dbb447e7a1d09cc
Wale Ogunwale [Wed, 18 Feb 2015 00:55:03 +0000 (16:55 -0800)]
Fixed NPE in ResourceManager when Activity.recreate is called.
Bug:
19408756
Change-Id: I291badce7fe9a6feaf2a5e8ce1005e6a86b30147
Tim Murray [Wed, 18 Feb 2015 00:44:32 +0000 (00:44 +0000)]
Merge "Revert "Revert "Add BLAS intrinsic."""
Tim Murray [Wed, 18 Feb 2015 00:44:08 +0000 (00:44 +0000)]
Revert "Revert "Add BLAS intrinsic.""
This reverts commit
aaab02a91fcb33388d958a6402b2e77481a0d5b2.
Change-Id: Iabc3684a9a8c2f9a781029f55120f0346ee9b289
Marco Nelissen [Wed, 18 Feb 2015 00:40:19 +0000 (00:40 +0000)]
am
2fddfea3: am
a3404263: am
2f71ee24: am
ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit '
2fddfea3e5311bb5503d148d7ad18240a13ee033':
Fix NPE
Craig Mautner [Wed, 18 Feb 2015 00:40:14 +0000 (00:40 +0000)]
am
2007a630: (-s ours) am
28de8edb: am
ab8f60e4: am
a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '
2007a630d4767b4e90f8ed727acd574424c2183c':
Do not make ActivityContainer available to apps. DO NOT MERGE
Rich Slogar [Wed, 18 Feb 2015 00:33:02 +0000 (00:33 +0000)]
am
6b5c3802: am
c9cc2c22: am
bd1fb402: am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge:
0f60943
* commit '
6b5c3802e1a8bd6a17b89ff8ce17aee13e9b2842':
docs: note to install linux packages
Rich Slogar [Wed, 18 Feb 2015 00:32:55 +0000 (00:32 +0000)]
am
3f9b7438: am
958f6505: am
f82c88e2: am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge:
5f31276
* commit '
3f9b7438fb5da9d366d2a950f5a5c22aa15601a0':
docs: studio training basics create and run project updates
Andrew Solovay [Wed, 18 Feb 2015 00:32:45 +0000 (00:32 +0000)]
am
6d6d0f91: am
46e881de: am
4eb14e02: am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge:
8d5ba01
* commit '
6d6d0f91bf694ead8fff5050101e327c59302a19':
docs: Noted that purchaseToken is long and cannot be truncated.
Rich Sloager [Wed, 18 Feb 2015 00:32:39 +0000 (00:32 +0000)]
am
821bb7fd: am
3a69c24f: am
dcf68e83: am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge:
d225cfc
* commit '
821bb7fdef6ae983a9c90ee9c763b941eba662a5':
Revert "docs: studio proxy setup"
Rich Slogar [Wed, 18 Feb 2015 00:32:32 +0000 (00:32 +0000)]
am
9f807e7e: am
6de1fd98: am
502f303c: am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge:
797c989
* commit '
9f807e7ef2793e02b592afa33d73633bb9343c4c':
docs: site mipmap folder updates
Rich Slogar [Wed, 18 Feb 2015 00:32:25 +0000 (00:32 +0000)]
am
27402330: am
b7fee4f4: am
6cdde671: am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge:
c694604
* commit '
2740233048452a10f5eebd0117e7c598faa65c80':
docs: studio mipmap update
Alan Viverette [Wed, 18 Feb 2015 00:30:24 +0000 (00:30 +0000)]
am
b20d48fd: am
014442c2: am
0dfae079: am
d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
* commit '
b20d48fd20928cf3167ee37649d702c90c7e0218':
Revert "Fixed accessibility for the pin input view on keyguard."
Alan Viverette [Wed, 18 Feb 2015 00:30:15 +0000 (00:30 +0000)]
am
7286d1ff: am
157c75e4: am
504c77e1: am
d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '
7286d1ff3747d3a71aeb2c8724947b35cc77d2d5':
Fix year picker initial range
Rich Slogar [Wed, 18 Feb 2015 00:30:08 +0000 (00:30 +0000)]
am
65d12bf7: am
c7067053: am
2b29d96f: am
82510fa5: am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge:
fa40f00
* commit '
65d12bf7f14ff7568cc3011793e219391f9c3d29':
docs: studio proxy setting setup
docs: studio proxy setup
Oliver Woodman [Wed, 18 Feb 2015 00:30:04 +0000 (00:30 +0000)]
am
ea970051: am
aa5b5b74: am
1289d522: am
2a6bf82e: am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge:
a40eb5d
* commit '
ea970051283dc11da11897771608f306b9fdfbbb':
Rich Slogar [Wed, 18 Feb 2015 00:30:00 +0000 (00:30 +0000)]
am
d9a8bce7: am
fa0ac1fd: am
696ea51a: am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545
* commit '
d9a8bce7e01e9b9483570f17ac243c1f30e01f3e':
Rich Slogar [Wed, 18 Feb 2015 00:29:56 +0000 (00:29 +0000)]
am
39545001: am
cb5f052e: am
4826bed5: am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9
* commit '
39545001fce300933da64671ad8cf17c7efd99d9':
David Friedman [Wed, 18 Feb 2015 00:29:52 +0000 (00:29 +0000)]
am
480fb3fa: am
32759833: am
40191d8e: am
a6614a12: am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge:
efb69b0
* commit '
480fb3fa913e0b7e57e23ae9f9f66d192c0ce904':
Deepanshu Gupta [Wed, 18 Feb 2015 00:29:47 +0000 (00:29 +0000)]
am
bd966f8f: am
803499e1: am
c2fa5e20: am
0a300b89: am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge:
0684991
* commit '
bd966f8f69663a49bb0bc456da409bab38a99835':
Rich Slogar [Wed, 18 Feb 2015 00:25:35 +0000 (00:25 +0000)]
am
c9cc2c22: am
bd1fb402: am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge:
0f60943
* commit '
c9cc2c228b70f73b0b2243e0a3ee7f41265aa232':
docs: note to install linux packages
Rich Slogar [Wed, 18 Feb 2015 00:25:31 +0000 (00:25 +0000)]
am
958f6505: am
f82c88e2: am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge:
5f31276
* commit '
958f65057b9cc82928f80d7d08ac5f1ed3ca6607':
docs: studio training basics create and run project updates
Andrew Solovay [Wed, 18 Feb 2015 00:25:23 +0000 (00:25 +0000)]
am
46e881de: am
4eb14e02: am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge:
8d5ba01
* commit '
46e881de6110cc09227dba1071a57c81b24250f7':
docs: Noted that purchaseToken is long and cannot be truncated.
OSDN Git Service
