OSDN Git Service
Deepanshu Gupta [Mon, 23 Feb 2015 19:09:14 +0000 (19:09 +0000)]
am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
Set forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 19:03:29 +0000 (19:03 +0000)]
am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
30a67cd17af03e53b8be5638f7f70d2989a7cd78':
Set forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Set forceFramework correctly for included layouts." into lmp-dev
David Friedman [Mon, 23 Feb 2015 18:20:37 +0000 (18:20 +0000)]
am
09e9076d: am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
09e9076ddfd5e9f738cd5096409ff3fb61174803':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:20:32 +0000 (18:20 +0000)]
am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
18c8a35fa4e775c3b515e739b0f32981395914ad':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:13:36 +0000 (18:13 +0000)]
am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:13:32 +0000 (18:13 +0000)]
am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
8e604689c8c8f8ad073e12094991daa712cd8f38':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:06:47 +0000 (18:06 +0000)]
am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
88e0145fb82b6711527ab173e4dc817e3f430708':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:06:43 +0000 (18:06 +0000)]
am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
3c26756aefae228941588042d677424b54167aa7':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:05:35 +0000 (18:05 +0000)]
Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:02:25 +0000 (18:02 +0000)]
Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
Deepanshu Gupta [Mon, 23 Feb 2015 17:18:08 +0000 (09:18 -0800)]
Set forceFramework correctly for included layouts.
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
Rich Slogar [Sat, 21 Feb 2015 01:04:52 +0000 (01:04 +0000)]
am
5b60b1a0: am
a91f6d00: am
4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '
5b60b1a0401afb4d1addf53ca40facb5b5f6c0ee':
docs: android plugin revisions page v2
Rich Slogar [Sat, 21 Feb 2015 00:58:17 +0000 (00:58 +0000)]
am
a91f6d00: am
4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '
a91f6d0003d852fc744ce4ce3a14b0786ac2f26f':
docs: android plugin revisions page v2
Rich Slogar [Sat, 21 Feb 2015 00:51:05 +0000 (00:51 +0000)]
am
4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '
4a99918b40329e7d041db0de1e1863d688eb1b3b':
docs: android plugin revisions page v2
Rich Slogar [Sat, 21 Feb 2015 00:44:49 +0000 (00:44 +0000)]
Merge "docs: android plugin revisions page v2" into lmp-docs
David Friedman [Fri, 13 Feb 2015 03:43:35 +0000 (19:43 -0800)]
Update Google Play brand-info page.
Bug:
18257984
Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c
Luan Nguyen [Fri, 20 Feb 2015 23:54:15 +0000 (23:54 +0000)]
am
969848c4: am
f900a1f4: am
81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit '
969848c4484b5430e00cac7c317cc5e35e7ec8f5':
docs: Fix issue with older devices section not expanding
Luan Nguyen [Fri, 20 Feb 2015 23:48:00 +0000 (23:48 +0000)]
am
f900a1f4: am
81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit '
f900a1f48abde96e41f40f61d3610b6245a9f94c':
docs: Fix issue with older devices section not expanding
Luan Nguyen [Fri, 20 Feb 2015 23:40:47 +0000 (23:40 +0000)]
am
81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
* commit '
81752cf5148b93ef84f8890cb04876344924eae8':
docs: Fix issue with older devices section not expanding
Luan Nguyen [Fri, 20 Feb 2015 23:36:16 +0000 (23:36 +0000)]
Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
Rich Slogar [Wed, 18 Feb 2015 21:09:43 +0000 (13:09 -0800)]
docs: android plugin revisions page v2
Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2
David Friedman [Fri, 20 Feb 2015 17:40:06 +0000 (09:40 -0800)]
Fixes several typos.
Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca
Adrian Roos [Fri, 20 Feb 2015 14:28:36 +0000 (14:28 +0000)]
Merge "Fix change IME content description" into lmp-mr1-dev
kmccormick [Thu, 19 Feb 2015 22:04:51 +0000 (22:04 +0000)]
am
a4fce24d: am
e16f4393: am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '
a4fce24d6652e3869f70ca9f549ef45661608114':
Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 21:58:53 +0000 (21:58 +0000)]
am
e16f4393: am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '
e16f439310b784bf46d033634e4a9e59a6a35c98':
Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 21:51:30 +0000 (21:51 +0000)]
am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '
506cba8b51474e5dc5cdcf381d0a25dc118c2aca':
Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 20:17:18 +0000 (12:17 -0800)]
Doc Update: fixed unescaped angle brackets in code snippets.
Change-Id: Ie265dd58fb3a5fcffe955992dea7a1f9417a27d7
Rich Slogar [Thu, 19 Feb 2015 19:12:48 +0000 (19:12 +0000)]
am
cc883a1f: am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
cc883a1ff3d46ffc3cb59915d6d292f91bd984a2':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 19:06:32 +0000 (19:06 +0000)]
am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
1e0face2f77ddc7d9eb8fe6708386bfbfc167ec9':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 18:59:21 +0000 (18:59 +0000)]
am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
b87aa6cb96341ab32d21f5340f1064fcaa607920':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 18:55:25 +0000 (18:55 +0000)]
Merge "docs: mipmap link updates" into lmp-docs
Rich Slogar [Thu, 19 Feb 2015 18:48:37 +0000 (10:48 -0800)]
docs: mipmap link updates
Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa
Adrian Roos [Thu, 19 Feb 2015 16:39:40 +0000 (17:39 +0100)]
Fix change IME content description
Bug:
19434845
Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d
Rich Slogar [Thu, 19 Feb 2015 17:05:34 +0000 (17:05 +0000)]
am
f213a8c9: am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads
* commit '
f213a8c980109f9be940236f19a5b79b9be2b007':
docs: studio 1.1 downloads
Rich Slogar [Thu, 19 Feb 2015 16:58:49 +0000 (16:58 +0000)]
am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads
* commit '
14bb9188bfd001bbb96749e51b8d5edc242c89e7':
docs: studio 1.1 downloads
Rich Slogar [Thu, 19 Feb 2015 16:52:35 +0000 (16:52 +0000)]
am
f4f059d4: docs: studio 1.1 downloads
* commit '
f4f059d423add55516a8ea4bb1522f1329039e47':
docs: studio 1.1 downloads
Rich Slogar [Tue, 17 Feb 2015 20:14:16 +0000 (12:14 -0800)]
docs: studio 1.1 downloads
Change-Id: I663a91baba3b0a1e51aa8e3dbc991f067d0c255c
Jim Miller [Thu, 19 Feb 2015 03:13:37 +0000 (03:13 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Jim Miller [Thu, 19 Feb 2015 01:55:26 +0000 (17:55 -0800)]
Fix accessibility focus bug in statusbar
The notification_stack_scroller view of the new uber statusbar should
not be focusable for accessibility
Fixes bug
19296202
Change-Id: I1b3f43ee3c480c705044cb3d565c7c7f7019bcc3
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
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
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
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: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
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
Rich Slogar [Wed, 18 Feb 2015 00:18:54 +0000 (00:18 +0000)]
am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs
automerge:
0f60943
* commit '
0f609432222e9eb946bfaa2bee45301324b97311':
docs: note to install linux packages
Rich Slogar [Wed, 18 Feb 2015 00:17:27 +0000 (00:17 +0000)]
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
Andrew Solovay [Wed, 18 Feb 2015 00:15:58 +0000 (00:15 +0000)]
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.
Rich Sloager [Wed, 18 Feb 2015 00:14:42 +0000 (00:14 +0000)]
am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
automerge:
d225cfc
* commit '
d225cfc811fd2f4041195b6df1094e2a8a13d3be':
Revert "docs: studio proxy setup"
Rich Slogar [Wed, 18 Feb 2015 00:13:07 +0000 (00:13 +0000)]
am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
automerge:
797c989
* commit '
797c989e3be0d081098866206b0e5829a7fe2ce2':
docs: site mipmap folder updates
Rich Slogar [Wed, 18 Feb 2015 00:11:42 +0000 (00:11 +0000)]
am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
automerge:
c694604
* commit '
c694604ec58fc16f2526c8689b0def0fbcfb6fc7':
docs: studio mipmap update
Rich Slogar [Wed, 18 Feb 2015 00:07:55 +0000 (00:07 +0000)]
am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs
* commit '
e0f61e1c516be37125f16f1f0899ea6244d094c2':
docs: note to install linux packages
Rich Slogar [Wed, 18 Feb 2015 00:00:39 +0000 (00:00 +0000)]
am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs
* commit '
717b4d130f67606c44122c2219ed35996afc360c':
docs: note to install linux packages
Rich Slogar [Tue, 17 Feb 2015 23:54:49 +0000 (23:54 +0000)]
Merge "docs: note to install linux packages" into lmp-docs
Marco Nelissen [Tue, 17 Feb 2015 23:54:29 +0000 (23:54 +0000)]
Merge "Fix NPE" into lmp-mr1-dev
Rich Slogar [Tue, 17 Feb 2015 23:53:49 +0000 (23:53 +0000)]
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
Rich Slogar [Tue, 17 Feb 2015 23:47:29 +0000 (23:47 +0000)]
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
Rich Slogar [Tue, 17 Feb 2015 23:40:35 +0000 (23:40 +0000)]
Merge "docs: studio training basics create and run project updates" into lmp-docs
Craig Mautner [Tue, 17 Feb 2015 23:30:33 +0000 (23:30 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
Andrew Solovay [Tue, 17 Feb 2015 22:56:18 +0000 (22:56 +0000)]
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.
Andrew Solovay [Tue, 17 Feb 2015 22:49:16 +0000 (22:49 +0000)]
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.
Alan Viverette [Tue, 17 Feb 2015 22:48:04 +0000 (22:48 +0000)]
Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
Andrew Solovay [Tue, 17 Feb 2015 22:41:03 +0000 (22:41 +0000)]
Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
Marco Nelissen [Tue, 17 Feb 2015 22:31:33 +0000 (14:31 -0800)]
Fix NPE
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.
Bug:
19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
Alan Viverette [Tue, 17 Feb 2015 22:33:03 +0000 (22:33 +0000)]
Merge "Fix year picker initial range" into lmp-mr1-dev
Rich Slogar [Tue, 17 Feb 2015 22:28:45 +0000 (22:28 +0000)]
am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
automerge:
fa40f00
* commit '
fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Sloager [Tue, 17 Feb 2015 22:27:44 +0000 (22:27 +0000)]
am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
* commit '
d75a68339af547b89068e1e4fe78d34c9b11f38e':
Revert "docs: studio proxy setup"
Oliver Woodman [Tue, 17 Feb 2015 22:27:16 +0000 (22:27 +0000)]
am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
automerge:
a40eb5d
* commit '
a40eb5db455ebb225a7ff0afa244256079d8cf20':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 22:25:53 +0000 (22:25 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
automerge:
bff1545
* commit '
bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:24:38 +0000 (22:24 +0000)]
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
David Friedman [Tue, 17 Feb 2015 22:22:50 +0000 (22:22 +0000)]
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.
Deepanshu Gupta [Tue, 17 Feb 2015 22:21:11 +0000 (22:21 +0000)]
am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
automerge:
0684991
* commit '
068499111c173fdd9869e7dbe5b9de857aca1c2d':
Add Asset management support for fonts.
Rich Slogar [Tue, 17 Feb 2015 22:20:51 +0000 (22:20 +0000)]
am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
* commit '
d72bea9dea10a956bf9b92de71e2dc046e7eae90':
docs: site mipmap folder updates
Rich Slogar [Tue, 17 Feb 2015 22:20:46 +0000 (22:20 +0000)]
am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
* commit '
43fb9e42df4754a7d2646898d384a369d329197c':
docs: studio mipmap update
Rich Sloager [Tue, 17 Feb 2015 22:20:43 +0000 (22:20 +0000)]
am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
* commit '
099ce51393721424a7cc1fbd29fe59a1970a55ed':
Revert "docs: studio proxy setup"
Diego Perez [Tue, 17 Feb 2015 22:19:43 +0000 (22:19 +0000)]
am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
automerge:
a912fed
* commit '
a912fedbc5fba99fb75884a1941d58170822ceb4':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 22:18:35 +0000 (22:18 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
automerge:
4e47416
* commit '
4e47416012b8cb88d564a04a29c0b79a28b9e529':
Changes made by intelliJ 14.1
Rich Slogar [Tue, 17 Feb 2015 22:13:51 +0000 (22:13 +0000)]
am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
* commit '
40132ee15afbc45858b637410aecb861da60878a':
docs: site mipmap folder updates
Rich Slogar [Tue, 17 Feb 2015 22:13:48 +0000 (22:13 +0000)]
am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
* commit '
3c3b780caea0bec62904a83f385f5a865fb259a7':
docs: studio mipmap update
Rich Sloager [Tue, 17 Feb 2015 22:13:44 +0000 (22:13 +0000)]
Merge "Revert "docs: studio proxy setup"" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:13:37 +0000 (22:13 +0000)]
am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* commit '
9c9a3afb95dcac7bf356edf25c8d86187ea59afd':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Sloager [Tue, 17 Feb 2015 22:10:27 +0000 (22:10 +0000)]
Revert "docs: studio proxy setup"
This reverts commit
c3e0107ce30aa676011bf7ea0daa9c8db750f024.
Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
Rich Slogar [Tue, 17 Feb 2015 22:08:41 +0000 (22:08 +0000)]
Merge "docs: site mipmap folder updates" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:06:45 +0000 (22:06 +0000)]
Merge "docs: studio mipmap update" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:06:21 +0000 (22:06 +0000)]
am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* commit '
8823b93d5c32bb7a8c757022ce055ca53b71171f':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Slogar [Tue, 17 Feb 2015 22:02:44 +0000 (22:02 +0000)]
Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* changes:
docs: studio proxy setting setup
docs: studio proxy setup
Alan Viverette [Tue, 17 Feb 2015 21:09:04 +0000 (13:09 -0800)]
Fix year picker initial range
BUG:
19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
Oliver Woodman [Tue, 17 Feb 2015 20:59:50 +0000 (20:59 +0000)]
am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
* commit '
533149d54f881e07f36c2fd62c861942542340fc':
Update ExoPlayer developer guide.
Oliver Woodman [Tue, 17 Feb 2015 20:53:13 +0000 (20:53 +0000)]
am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
* commit '
fe3e71befacc5d0777eb0c7099dd910197cfb6b6':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 20:49:44 +0000 (20:49 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
8c124744b625f547a5ba15cbb442c605f109bae0':
docs: studio revision 1-1
Oliver Woodman [Tue, 17 Feb 2015 20:48:49 +0000 (20:48 +0000)]
Merge "Update ExoPlayer developer guide." into lmp-docs
Oliver Woodman [Mon, 16 Feb 2015 17:49:34 +0000 (17:49 +0000)]
Update ExoPlayer developer guide.
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.
Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
Rich Slogar [Tue, 17 Feb 2015 20:42:44 +0000 (20:42 +0000)]
am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
docs: studio revision 1-1
OSDN Git Service
