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 |
|
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 |
|
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 |
|
Joe Fernandez
|
e385672c9c
|
docs: remove reference to GCM doc from C2DM doc
Change-Id: Ic044916487d56bab22e30b24392890b97acf9d44
|
2015-02-18 16:16:43 -08: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
|
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
|
56375d9066
|
docs: lint inspection updates
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
|
2015-02-18 14:17:21 -08:00 |
|
Rich Slogar
|
90fa535569
|
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
|
2015-02-18 11:37:57 +00:00 |
|
Chris Banes
|
4b201a5731
|
resolved conflicts for merge of cbc1ac33 to master
Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6
|
2015-02-18 11:32:48 +00:00 |
|
Andrew Solovay
|
2b40531c62
|
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.
|
2015-02-18 11:13:30 +00:00 |
|
Rich Sloager
|
263b8fb778
|
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"
|
2015-02-18 11:13:23 +00:00 |
|
Rich Slogar
|
6c65063aa0
|
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
|
2015-02-18 11:13:15 +00:00 |
|
Chris Banes
|
6026f73406
|
resolved conflicts for merge of 1c131eeb to master
Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5
|
2015-02-18 11:02:49 +00:00 |
|
Rich Slogar
|
2767201795
|
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
|
2015-02-18 00:33:02 +00:00 |
|
Rich Slogar
|
cbc1ac33a4
|
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
|
2015-02-18 00:32:55 +00:00 |
|
Andrew Solovay
|
875b278c75
|
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.
|
2015-02-18 00:32:45 +00:00 |
|
Rich Sloager
|
85b066cb8a
|
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"
|
2015-02-18 00:32:39 +00:00 |
|
Rich Slogar
|
e9d86f5853
|
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
|
2015-02-18 00:32:32 +00:00 |
|
Rich Slogar
|
1c131eeb99
|
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
|
2015-02-18 00:32:25 +00:00 |
|
Rich Slogar
|
7a217113d8
|
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
|
2015-02-18 00:30:08 +00:00 |
|
Rich Slogar
|
bd1fb4021f
|
am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
automerge: 0f60943
* commit '0f609432222e9eb946bfaa2bee45301324b97311':
docs: note to install linux packages
|
2015-02-18 00:18:54 +00:00 |
|
Rich Slogar
|
f82c88e28e
|
am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs
automerge: 5f31276
* commit '5f3127620255167469fcba3d21334eb23217611d':
docs: studio training basics create and run project updates
|
2015-02-18 00:17:27 +00:00 |
|
Andrew Solovay
|
4eb14e0294
|
am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
automerge: 8d5ba01
* commit '8d5ba018266448caeb44637d273f63dbff2956af':
docs: Noted that purchaseToken is long and cannot be truncated.
|
2015-02-18 00:15:58 +00:00 |
|
Rich Sloager
|
dcf68e83d6
|
am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
automerge: d225cfc
* commit 'd225cfc811fd2f4041195b6df1094e2a8a13d3be':
Revert "docs: studio proxy setup"
|
2015-02-18 00:14:42 +00:00 |
|
Rich Slogar
|
502f303c61
|
am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
automerge: 797c989
* commit '797c989e3be0d081098866206b0e5829a7fe2ce2':
docs: site mipmap folder updates
|
2015-02-18 00:13:07 +00:00 |
|
Rich Slogar
|
6cdde6718c
|
am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
automerge: c694604
* commit 'c694604ec58fc16f2526c8689b0def0fbcfb6fc7':
docs: studio mipmap update
|
2015-02-18 00:11:42 +00:00 |
|
Oliver Woodman
|
dc24d421cf
|
am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d automerge: 1289d52
automerge: 6a71e81
* commit '6a71e814a3207fbe2cffe0650a1c37688f2aa62e':
Update ExoPlayer developer guide.
|
2015-02-17 23:57:47 +00:00 |
|
Rich Slogar
|
717b4d130f
|
Merge "docs: note to install linux packages" into lmp-docs
|
2015-02-17 23:54:50 +00:00 |
|
Rich Slogar
|
af825ef7b6
|
am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545 automerge: 696ea51
automerge: 0a87137
* commit '0a8713799cb6ebab4f40ef3313ea71df9c580146':
docs: studio revision 1-1
|
2015-02-17 23:44:47 +00:00 |
|
Rich Slogar
|
e4c42929e9
|
am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 automerge: 4826bed
automerge: 7b3a118
* commit '7b3a11802ad2c344577f651f1a0ef5083b4133eb':
docs: android plugin for gradle revisions page
|
2015-02-17 23:43:03 +00:00 |
|
David Friedman
|
6af7418624
|
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 automerge: 40191d8
automerge: cdf0774
* commit 'cdf0774314842eb16f8db2b822a6d6538f17090e':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
|
2015-02-17 23:41:29 +00:00 |
|
Rich Slogar
|
9911aa5125
|
Merge "docs: studio training basics create and run project updates" into lmp-docs
|
2015-02-17 23:40:36 +00:00 |
|
Rich Slogar
|
65d12bf7f1
|
am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00
* commit 'c7067053252413f78edbd6f21618a65a72235542':
docs: studio proxy setting setup
docs: studio proxy setup
|
2015-02-17 22:51:48 +00:00 |
|
Oliver Woodman
|
6a71e814a3
|
am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d
automerge: 1289d52
* commit '1289d522986e44c681bae020cb6dffe1d563b1ed':
Update ExoPlayer developer guide.
|
2015-02-17 22:47:16 +00:00 |
|
Rich Slogar
|
0a8713799c
|
am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545
automerge: 696ea51
* commit '696ea51a1c7c01061daf8693101e48d5d0701293':
docs: studio revision 1-1
|
2015-02-17 22:45:49 +00:00 |
|
Rich Slogar
|
7b3a11802a
|
am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9
automerge: 4826bed
* commit '4826bed5dbb07bc819db071b02de7c30925ff8a6':
docs: android plugin for gradle revisions page
|
2015-02-17 22:43:17 +00:00 |
|
David Friedman
|
cdf0774314
|
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
automerge: 40191d8
* commit '40191d8e780724107c87edc5b1cfcea68a1442ca':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
|
2015-02-17 22:41:10 +00:00 |
|
Andrew Solovay
|
fd454a579f
|
Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
|
2015-02-17 22:41:04 +00:00 |
|
Rich Slogar
|
82510fa5a6
|
am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
automerge: fa40f00
* commit 'fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
docs: studio proxy setting setup
docs: studio proxy setup
|
2015-02-17 22:28:45 +00:00 |
|
Oliver Woodman
|
2a6bf82e26
|
am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
automerge: a40eb5d
* commit 'a40eb5db455ebb225a7ff0afa244256079d8cf20':
Update ExoPlayer developer guide.
|
2015-02-17 22:27:16 +00:00 |
|
Rich Slogar
|
dbb32faf33
|
am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
automerge: bff1545
* commit 'bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
docs: studio revision 1-1
|
2015-02-17 22:25:53 +00:00 |
|
Rich Slogar
|
2d43b7300d
|
am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
automerge: cb73fb9
* commit 'cb73fb90443a3a3fee645aa3f01d38b19f108377':
docs: android plugin for gradle revisions page
|
2015-02-17 22:24:38 +00:00 |
|
David Friedman
|
a6614a12bb
|
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 'efb69b003e24757fbf04f219a61a4a71adada3a2':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
|
2015-02-17 22:22:50 +00:00 |
|
Rich Sloager
|
099ce51393
|
Merge "Revert "docs: studio proxy setup"" into lmp-docs
|
2015-02-17 22:13:45 +00:00 |
|
Rich Sloager
|
383dacc738
|
Revert "docs: studio proxy setup"
This reverts commit c3e0107ce3.
Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
|
2015-02-17 22:10:27 +00:00 |
|
Rich Slogar
|
40132ee15a
|
Merge "docs: site mipmap folder updates" into lmp-docs
|
2015-02-17 22:08:42 +00:00 |
|
Rich Slogar
|
3c3b780cae
|
Merge "docs: studio mipmap update" into lmp-docs
|
2015-02-17 22:06:46 +00:00 |
|
Rich Slogar
|
8823b93d5c
|
Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* changes:
docs: studio proxy setting setup
docs: studio proxy setup
|
2015-02-17 22:02:45 +00:00 |
|
Oliver Woodman
|
fe3e71befa
|
Merge "Update ExoPlayer developer guide." into lmp-docs
|
2015-02-17 20:48:50 +00:00 |
|