OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual...
Andrew Solovay [Fri, 27 Feb 2015 16:46:49 +0000 (16:46 +0000)]
am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Andrew Solovay [Fri, 27 Feb 2015 16:37:38 +0000 (16:37 +0000)]
am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agodocs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Andrew Solovay [Tue, 27 Jan 2015 03:35:37 +0000 (19:35 -0800)]
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

Documented new support for users upgrading/downgrading subscriptions
in the middle of a sub period, and for users manually renewing
before the subscription period ends. Also updated testing docs
to reflect that sandbox now supports testing subscriptions, and
documented new "autoRenewing" field in INAPP_PURCHASE_DATA.

See first comment for doc stage location.

bug: 18982828
bug: 18916814
bug: 18951608
bug: 18908756
Change-Id: I530b57d840ed5aeefe4c6a688a2e59aec41ec7d0

9 years agoam 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:15:41 +0000 (18:15 +0000)]
am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
  docs: 9patch tool update

9 years agoam 0a504745: Merge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:08:39 +0000 (18:08 +0000)]
am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
  docs: 9patch tool update

9 years agoMerge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:02:41 +0000 (18:02 +0000)]
Merge "docs: 9patch tool update" into lmp-docs

9 years agoam 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:25:11 +0000 (23:25 +0000)]
am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit '411046324743055e9eef3b04109c998b5354b496':
  docs: remove exploring sdk link

9 years agoam 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update"...
Rich Slogar [Wed, 25 Feb 2015 23:25:07 +0000 (23:25 +0000)]
am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit '84994e876e728fa57f06d803f7c4abfbc9df40db':
  docs: note to install linux packages v2 update

9 years agoam eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:17:31 +0000 (23:17 +0000)]
am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
  docs: remove exploring sdk link

9 years agoam db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:17:23 +0000 (23:17 +0000)]
am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
  docs: note to install linux packages v2 update

9 years agoMerge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:12:32 +0000 (23:12 +0000)]
Merge "docs: remove exploring sdk link" into lmp-docs

9 years agoMerge "docs: note to install linux packages v2 update" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:11:22 +0000 (23:11 +0000)]
Merge "docs: note to install linux packages v2 update" into lmp-docs

9 years agoam c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into...
Joe Fernandez [Wed, 25 Feb 2015 08:06:01 +0000 (08:06 +0000)]
am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528':
  docs: Android for Work developer landing page

9 years agoam 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:59:48 +0000 (07:59 +0000)]
am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page

9 years agoMerge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:52:29 +0000 (07:52 +0000)]
Merge "docs: Android for Work developer landing page" into lmp-docs

9 years agoam 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:49:37 +0000 (07:49 +0000)]
am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '790b1bc864d9066ff691b0e12a4e14ef85566c50':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:42:44 +0000 (07:42 +0000)]
am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
  docs: New doc for creating an AfW Work Policy Controller

9 years agodocs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Fri, 20 Feb 2015 01:57:50 +0000 (17:57 -0800)]
docs: New doc for creating an AfW Work Policy Controller

See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415

9 years agodocs: Android for Work developer landing page
Joe Fernandez [Fri, 20 Feb 2015 07:56:07 +0000 (23:56 -0800)]
docs: Android for Work developer landing page

Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a

9 years agoam 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into...
Andrew Solovay [Wed, 25 Feb 2015 01:14:58 +0000 (01:14 +0000)]
am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '6ffe1058463e5f4e65aa131796b37c0443d1b44b':
  docs: New "implementing app restrictions" doc

9 years agoam a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
Andrew Solovay [Wed, 25 Feb 2015 01:07:25 +0000 (01:07 +0000)]
am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
  docs: New "implementing app restrictions" doc

9 years agodocs: note to install linux packages v2 update
Rich Slogar [Wed, 25 Feb 2015 00:58:34 +0000 (16:58 -0800)]
docs: note to install linux packages v2 update

b.android 155803

Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834

9 years agoMerge "docs: New "implementing app restrictions" doc" into lmp-docs
Andrew Solovay [Wed, 25 Feb 2015 01:01:55 +0000 (01:01 +0000)]
Merge "docs: New "implementing app restrictions" doc" into lmp-docs

9 years agoam f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 00:26:51 +0000 (00:26 +0000)]
am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
  Explain behavior of boundless ripple projection

9 years agodocs: New "implementing app restrictions" doc
Andrew Solovay [Wed, 11 Feb 2015 21:12:18 +0000 (13:12 -0800)]
docs: New "implementing app restrictions" doc

New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.

Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac

9 years agoam ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 00:18:51 +0000 (00:18 +0000)]
am ea2a0648: Explain behavior of boundless ripple projection

* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection

9 years agoExplain behavior of boundless ripple projection
Chris Craik [Tue, 24 Feb 2015 21:58:26 +0000 (13:58 -0800)]
Explain behavior of boundless ripple projection

Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab

9 years agodocs: remove exploring sdk link
Rich Slogar [Mon, 23 Feb 2015 19:30:02 +0000 (11:30 -0800)]
docs: remove exploring sdk link

b.android 153523

Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd

9 years agoam 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
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.

9 years agoMerge "Set forceFramework correctly for included layouts." into lmp-dev
Deepanshu Gupta [Mon, 23 Feb 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Set forceFramework correctly for included layouts." into lmp-dev

9 years agoam ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
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.

9 years agoam 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984...
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

9 years agoam 88e0145f: Merge "Fixes several typos." into lmp-docs
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.

9 years agoam 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
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

9 years agoMerge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:05:35 +0000 (18:05 +0000)]
Merge "Fixes several typos." into lmp-docs

9 years agoMerge "Update Google Play brand-info page. Bug: 18257984" 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

9 years agoSet forceFramework correctly for included layouts.
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

9 years agoam a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp...
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

9 years agoam 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
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

9 years agoMerge "docs: android plugin revisions page v2" into lmp-docs
Rich Slogar [Sat, 21 Feb 2015 00:44:49 +0000 (00:44 +0000)]
Merge "docs: android plugin revisions page v2" into lmp-docs

9 years agoUpdate Google Play brand-info page.
David Friedman [Fri, 13 Feb 2015 03:43:35 +0000 (19:43 -0800)]
Update Google Play brand-info page.
Bug: 18257984

Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c

9 years agoam f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expan...
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

9 years agoam 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into...
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

9 years agoMerge "docs: Fix issue with older devices section not expanding" into lmp-docs
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

9 years agodocs: android plugin revisions page v2
Rich Slogar [Wed, 18 Feb 2015 21:09:43 +0000 (13:09 -0800)]
docs: android plugin revisions page v2

Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2

9 years agoFixes several typos.
David Friedman [Fri, 20 Feb 2015 17:40:06 +0000 (09:40 -0800)]
Fixes several typos.

Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca

9 years agoam e16f4393: am 506cba8b: 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.

9 years agoam 506cba8b: 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.

9 years agoDoc 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

9 years agoam 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
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

9 years agoam b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
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

9 years agoMerge "docs: mipmap link updates" into lmp-docs
Rich Slogar [Thu, 19 Feb 2015 18:55:25 +0000 (18:55 +0000)]
Merge "docs: mipmap link updates" into lmp-docs

9 years agodocs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 18:48:37 +0000 (10:48 -0800)]
docs: mipmap link updates

Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa

9 years agoam 14bb9188: am f4f059d4: 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

9 years agoam f4f059d4: 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

9 years agodocs: 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

9 years agoam de91b384: am e385672c: 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

9 years agoam e385672c: 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

9 years agodocs: 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

9 years agoam 494d5b77: Merge "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

9 years agoMerge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
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

9 years agoam 755c5d88: am 56375d90: 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

9 years agoam 56375d90: 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

9 years agodocs: lint inspection updates
Rich Slogar [Wed, 7 Jan 2015 21:52:12 +0000 (13:52 -0800)]
docs: lint inspection updates

Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f

9 years agodocs: 9patch tool update
Rich Slogar [Thu, 22 Jan 2015 19:27:42 +0000 (11:27 -0800)]
docs: 9patch tool update

b/18019306

Change-Id: I8cd84afe47d0d3ac344f0581075c015049777e27

9 years agoam e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
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

9 years agoam 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
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

9 years agoMerge "docs: note to install linux packages" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 23:54:49 +0000 (23:54 +0000)]
Merge "docs: note to install linux packages" into lmp-docs

9 years agoam c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project...
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

9 years agoam 9911aa51: Merge "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

9 years agoMerge "docs: studio training basics create and run project updates" into lmp-docs
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

9 years agoam d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot...
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.

9 years agoam fd454a57: Merge "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.

9 years agoMerge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp...
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

9 years agoam d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
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"

9 years agoam d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
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

9 years agoam 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
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

9 years agoam 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
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"

9 years agoam 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
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

9 years agoam 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
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

9 years agoMerge "Revert "docs: studio proxy setup"" into lmp-docs
Rich Sloager [Tue, 17 Feb 2015 22:13:44 +0000 (22:13 +0000)]
Merge "Revert "docs: studio proxy setup"" into lmp-docs

9 years agoam 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a 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

9 years agoRevert "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

9 years agoMerge "docs: site mipmap folder updates" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:08:41 +0000 (22:08 +0000)]
Merge "docs: site mipmap folder updates" into lmp-docs

9 years agoMerge "docs: studio mipmap update" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:06:45 +0000 (22:06 +0000)]
Merge "docs: studio mipmap update" into lmp-docs

9 years agoam 8823b93d: Merge changes If3a78fc7,Ifbe3f03a 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

9 years agoMerge changes If3a78fc7,Ifbe3f03a into lmp-docs
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

9 years agoam 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
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.

9 years agoam fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
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.

9 years agoam 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
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

9 years agoMerge "Update ExoPlayer developer guide." into lmp-docs
Oliver Woodman [Tue, 17 Feb 2015 20:48:49 +0000 (20:48 +0000)]
Merge "Update ExoPlayer developer guide." into lmp-docs

9 years agoUpdate ExoPlayer developer guide.
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

9 years agoam 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
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

9 years agoMerge "docs: studio revision 1-1" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:37:51 +0000 (20:37 +0000)]
Merge "docs: studio revision 1-1" into lmp-docs

9 years agodocs: site mipmap folder updates
Rich Slogar [Mon, 9 Feb 2015 19:40:44 +0000 (11:40 -0800)]
docs: site mipmap folder updates

b/12874352

Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9

9 years agoam d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page"...
Rich Slogar [Tue, 17 Feb 2015 20:26:46 +0000 (20:26 +0000)]
am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs

* commit 'd285664399f8f68750e75707a35046e3c9592a2d':
  docs: android plugin for gradle revisions page

9 years agoam 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:19:59 +0000 (20:19 +0000)]
am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs

* commit '4abf87f134fa81460e018bb7130e88639281e1ce':
  docs: android plugin for gradle revisions page

9 years agoMerge "docs: android plugin for gradle revisions page" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:16:08 +0000 (20:16 +0000)]
Merge "docs: android plugin for gradle revisions page" into lmp-docs

9 years agoam 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I...
David Friedman [Sat, 14 Feb 2015 02:50:49 +0000 (02:50 +0000)]
am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs

* commit '53ec037f9eb0e29f958faa334cf23c35f079eb85':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.

9 years agoam 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it...
David Friedman [Sat, 14 Feb 2015 02:42:44 +0000 (02:42 +0000)]
am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs

* commit '03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.