155840 Commits

Author SHA1 Message Date
David Friedman
18c8a35fa4 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
2015-02-23 18:13:32 +00:00
David Friedman
ab0f8ff740 am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.
2015-02-23 18:06:47 +00:00
David Friedman
8e604689c8 am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984
2015-02-23 18:06:43 +00:00
David Friedman
88e0145fb8 Merge "Fixes several typos." into lmp-docs 2015-02-23 18:05:36 +00:00
David Friedman
3c26756aef Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 2015-02-23 18:02:26 +00:00
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts.
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
2015-02-23 17:26:12 +00:00
Rich Slogar
5b60b1a040 am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit 'a91f6d0003d852fc744ce4ce3a14b0786ac2f26f':
  docs: android plugin revisions page v2
2015-02-21 00:58:17 +00:00
Rich Slogar
a91f6d0003 am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
* commit '4a99918b40329e7d041db0de1e1863d688eb1b3b':
  docs: android plugin revisions page v2
2015-02-21 00:51:05 +00:00
Rich Slogar
4a99918b40 Merge "docs: android plugin revisions page v2" into lmp-docs 2015-02-21 00:44:50 +00:00
David Friedman
c03e7dd850 Update Google Play brand-info page.
Bug: 18257984

Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c
2015-02-20 16:33:48 -08:00
Luan Nguyen
969848c448 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
2015-02-20 23:48:00 +00:00
Luan Nguyen
f900a1f48a 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
2015-02-20 23:40:47 +00:00
Luan Nguyen
81752cf514 Merge "docs: Fix issue with older devices section not expanding" into lmp-docs 2015-02-20 23:36:17 +00:00
Rich Slogar
ed1cf523ad docs: android plugin revisions page v2
Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2
2015-02-20 09:52:13 -08:00
David Friedman
7cdd6671f8 Fixes several typos.
Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca
2015-02-20 09:40:06 -08:00
kmccormick
a4fce24d66 am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'e16f439310b784bf46d033634e4a9e59a6a35c98':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 21:58:53 +00:00
kmccormick
e16f439310 am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '506cba8b51474e5dc5cdcf381d0a25dc118c2aca':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 21:51:30 +00:00
kmccormick
506cba8b51 Doc Update: fixed unescaped angle brackets in code snippets.
Change-Id: Ie265dd58fb3a5fcffe955992dea7a1f9417a27d7
2015-02-19 12:17:18 -08:00
Rich Slogar
cc883a1ff3 am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '1e0face2f77ddc7d9eb8fe6708386bfbfc167ec9':
  docs: mipmap link updates
2015-02-19 19:06:32 +00:00
Rich Slogar
1e0face2f7 am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit 'b87aa6cb96341ab32d21f5340f1064fcaa607920':
  docs: mipmap link updates
2015-02-19 18:59:21 +00:00
Rich Slogar
b87aa6cb96 Merge "docs: mipmap link updates" into lmp-docs 2015-02-19 18:55:26 +00:00
Rich Slogar
0f44b94d5d docs: mipmap link updates
Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa
2015-02-19 10:48:37 -08:00
Craig Mautner
40f616b1f6 Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-19 09:44:53 -08:00
Rich Slogar
f213a8c980 am 14bb9188: am f4f059d4: docs: studio 1.1 downloads
* commit '14bb9188bfd001bbb96749e51b8d5edc242c89e7':
  docs: studio 1.1 downloads
2015-02-19 16:58:49 +00:00
Rich Slogar
14bb9188bf am f4f059d4: docs: studio 1.1 downloads
* commit 'f4f059d423add55516a8ea4bb1522f1329039e47':
  docs: studio 1.1 downloads
2015-02-19 16:52:35 +00:00
Rich Slogar
f4f059d423 docs: studio 1.1 downloads
Change-Id: I663a91baba3b0a1e51aa8e3dbc991f067d0c255c
2015-02-19 08:45:23 -08:00
Ryosuke Matsuuchi
3b8defacdd doc: Add Japanese version of DAC/distribute/ page.
Bug: 18847144
Change-Id: I7bd98c381d8d58367862daedb7aaedfb0112b9d1
2015-02-18 20:31:05 -08: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
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
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
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
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
Rich Slogar
4bdb437bc6 docs: 9patch tool update
b/18019306

Change-Id: I8cd84afe47d0d3ac344f0581075c015049777e27
2015-02-18 10:36:05 -08: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
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
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
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
Rich Slogar
9911aa5125 Merge "docs: studio training basics create and run project updates" into lmp-docs 2015-02-17 23:40:36 +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
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
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 Sloager
d225cfc811 am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
* commit 'd75a68339af547b89068e1e4fe78d34c9b11f38e':
  Revert "docs: studio proxy setup"
2015-02-17 22:27:44 +00:00
Rich Slogar
797c989e3b am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
* commit 'd72bea9dea10a956bf9b92de71e2dc046e7eae90':
  docs: site mipmap folder updates
2015-02-17 22:20:51 +00:00
Rich Slogar
c694604ec5 am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
* commit '43fb9e42df4754a7d2646898d384a369d329197c':
  docs: studio mipmap update
2015-02-17 22:20:46 +00:00
Rich Sloager
d75a68339a am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
* commit '099ce51393721424a7cc1fbd29fe59a1970a55ed':
  Revert "docs: studio proxy setup"
2015-02-17 22:20:43 +00:00
Rich Slogar
d72bea9dea am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
* commit '40132ee15afbc45858b637410aecb861da60878a':
  docs: site mipmap folder updates
2015-02-17 22:13:51 +00:00