174796 Commits

Author SHA1 Message Date
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
6b5c3802e1 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
2015-02-18 00:25:35 +00:00
Rich Slogar
3f9b7438fb 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
2015-02-18 00:25:31 +00:00
Andrew Solovay
6d6d0f91bf 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.
2015-02-18 00:25:23 +00:00
Rich Sloager
821bb7fdef am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc
* commit '3a69c24fcaa01f276b5a77e05487f9614c3ae246':
  Revert "docs: studio proxy setup"
2015-02-18 00:25:20 +00:00
Rich Slogar
9f807e7ef2 am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989
* commit '6de1fd98f73b94c8bd5508b3e3d419d0b5d19621':
  docs: site mipmap folder updates
2015-02-18 00:25:16 +00:00
Rich Slogar
2740233048 am b7fee4f4: am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604
* commit 'b7fee4f47c26c39f88e036b0dc368557f7b0cec0':
  docs: studio mipmap update
2015-02-18 00:25:12 +00:00
Rich Slogar
c9cc2c228b am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943
* commit 'bd1fb4021f790c7f61f2bb64feef1df8f14b1b7f':
  docs: note to install linux packages
2015-02-18 00:22:40 +00:00
Rich Slogar
958f65057b am f82c88e2: am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge: 5f31276
* commit 'f82c88e28eddd5f38b53f66b345c030063bc17fe':
  docs: studio training basics create and run project updates
2015-02-18 00:22:35 +00:00
Andrew Solovay
46e881de61 am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01
* commit '4eb14e0294a675d7350cfe3da01f1c9f37fb2943':
  docs: Noted that purchaseToken is long and cannot be truncated.
2015-02-18 00:22:28 +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 Sloager
3a69c24fca am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc
* commit 'dcf68e83d6868abb6334c7a1881724f04929e87c':
  Revert "docs: studio proxy setup"
2015-02-18 00:18:01 +00:00
Rich Slogar
6de1fd98f7 am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989
* commit '502f303c6108515a86d2826d1e87d474ffdb0945':
  docs: site mipmap folder updates
2015-02-18 00:17:56 +00:00
Rich Slogar
b7fee4f47c am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604
* commit '6cdde6718c36851e136e7358ba2ac1fd32f6aae5':
  docs: studio mipmap update
2015-02-18 00:17:52 +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
Marco Nelissen
2fddfea3e5 am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit 'a3404263c08c711fa5f2d73a92ec7c6f366b9338':
  Fix NPE
2015-02-18 00:15:00 +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
Marco Nelissen
a3404263c0 am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
  Fix NPE
2015-02-18 00:07:58 +00:00
Rich Slogar
0f60943222 am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
* commit 'e0f61e1c516be37125f16f1f0899ea6244d094c2':
  docs: note to install linux packages
2015-02-18 00:07:55 +00:00
Marco Nelissen
2f71ee24c5 am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
2015-02-18 00:01:02 +00:00
Rich Slogar
e0f61e1c51 am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
* commit '717b4d130f67606c44122c2219ed35996afc360c':
  docs: note to install linux packages
2015-02-18 00:00:39 +00:00
Rich Slogar
717b4d130f Merge "docs: note to install linux packages" into lmp-docs 2015-02-17 23:54:50 +00:00
Marco Nelissen
ffaee8bda9 Merge "Fix NPE" into lmp-mr1-dev 2015-02-17 23:54:30 +00:00
Rich Slogar
5f31276202 am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs
* commit 'c48e9bde6f5ae924dc1f9691da086c0a9077be3a':
  docs: studio training basics create and run project updates
2015-02-17 23:53:49 +00:00
Craig Mautner
2007a630d4 am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:53:11 +00:00
Rich Slogar
c48e9bde6f am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs
* commit '9911aa51255d26c4299ab612430cd400e9468bcc':
  docs: studio training basics create and run project updates
2015-02-17 23:47:29 +00:00
Craig Mautner
28de8edb7d am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:43:33 +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
Craig Mautner
ab8f60e425 am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:36:51 +00:00
Craig Mautner
a94e42970d Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 2015-02-17 23:30:34 +00:00
Alan Viverette
b20d48fd20 am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
* commit '014442c28eae214af56f4c1fe3e0c21d5b091d25':
  Revert "Fixed accessibility for the pin input view on keyguard."
2015-02-17 23:06:55 +00:00
Alan Viverette
014442c28e am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
* commit '0dfae079633764c3b6fceaea38fdc664e0e5a76d':
  Revert "Fixed accessibility for the pin input view on keyguard."
2015-02-17 22:59:29 +00:00
Andrew Solovay
8d5ba01826 am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
* commit 'd4c63b98aa25370a1ed4b57199c71413d6e24750':
  docs: Noted that purchaseToken is long and cannot be truncated.
2015-02-17 22:56:18 +00:00
Alan Viverette
0dfae07963 am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
* commit 'd5471a0b2bf938cf83f4abac66a18664d8ca5277':
  Revert "Fixed accessibility for the pin input view on keyguard."
2015-02-17 22:52:06 +00:00
Alan Viverette
7286d1ff37 am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '157c75e4b55d34d0426d08044130d74c2369be07':
  Fix year picker initial range
2015-02-17 22:51:53 +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
ea97005128 am aa5b5b74: am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d
* commit 'aa5b5b7465bf667328d7400dee51f1d93412ef6c':
2015-02-17 22:51:43 +00:00
Rich Slogar
d9a8bce7e0 am fa0ac1fd: am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545
* commit 'fa0ac1fd5c7489a193f5aad55c5ed1292da8fcc0':
2015-02-17 22:51:38 +00:00
Rich Slogar
39545001fc am cb5f052e: am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9
* commit 'cb5f052e1179887c0f9cddb1f24120f5f3b75a05':
2015-02-17 22:51:33 +00:00
David Friedman
480fb3fa91 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 '32759833c0f8ff8f257f3d0436438e760fafca68':
2015-02-17 22:51:27 +00:00
Deepanshu Gupta
bd966f8f69 am 803499e1: am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991
* commit '803499e1dbb2206f19751dede54ebfc25ccaa6b2':
2015-02-17 22:51:19 +00:00
Diego Perez
8a8b00686f am a0235f8b: am d66f2eb2: am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed
* commit 'a0235f8bb9b78caa065d1857d435e4a45f5c9bce':
2015-02-17 22:51:14 +00:00
Deepanshu Gupta
f242e927ba am 79ded2d0: am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416
* commit '79ded2d035a53135dfd23caaf635b5a9a9f8ddc0':
2015-02-17 22:51:09 +00:00
Andrew Solovay
d4c63b98aa am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
* commit 'fd454a579f5a474546db616aa014505cd50865b5':
  docs: Noted that purchaseToken is long and cannot be truncated.
2015-02-17 22:49:16 +00:00
Alan Viverette
d5471a0b2b Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev 2015-02-17 22:48:05 +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