summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work ↵Joe Fernandez2015-02-254-50/+77
|\ | | | | | | | | | | | | developer landing page" into lmp-docs * commit 'f7224396ee8416630b9387995a79faae1ee68b7c': docs: Android for Work developer landing page
| * Merge "docs: Android for Work developer landing page" into lmp-docsJoe Fernandez2015-02-254-50/+77
| |\
| | * docs: Android for Work developer landing pageJoe Fernandez2015-02-244-50/+77
| | | | | | | | | | | | Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
* | | am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW ↵Andrew Solovay2015-02-252-1/+345
|\ \ \ | |/ / | | | | | | | | | | | | | | | Work Policy Controller * commit 'e64301e639e73f346a78584af2727bc98f3d81ae': docs: New doc for creating an AfW Work Policy Controller
| * | docs: New doc for creating an AfW Work Policy ControllerAndrew Solovay2015-02-242-1/+345
| | | | | | | | | | | | | | | | | | See first comment for doc stage location. Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
* | | am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app ↵Andrew Solovay2015-02-252-5/+378
|\ \ \ | |/ / | | | | | | | | | | | | | | | restrictions" doc" into lmp-docs * commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926': docs: New "implementing app restrictions" doc
| * | Merge "docs: New "implementing app restrictions" doc" into lmp-docsAndrew Solovay2015-02-252-5/+378
| |\ \
| | * | docs: New "implementing app restrictions" docAndrew Solovay2015-02-242-5/+378
| | |/ | | | | | | | | | | | | | | | | | | New doc on app restrictions, aimed primarily at developers of enterprise apps. See first comment for doc stage location. Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
* | | am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple ↵Chris Craik2015-02-251-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | projection * commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d': Explain behavior of boundless ripple projection
| * | Explain behavior of boundless ripple projectionChris Craik2015-02-251-2/+3
| |/ | | | | | | Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
* | am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into ↵David Friedman2015-02-231-3/+3
|\ \ | |/ | | | | | | | | | | lmp-docs * commit '09e9076ddfd5e9f738cd5096409ff3fb61174803': Fixes several typos.
| * Merge "Fixes several typos." into lmp-docsDavid Friedman2015-02-231-3/+3
| |\
| | * Fixes several typos.David Friedman2015-02-201-3/+3
| | | | | | | | | | | | Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca
* | | am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info ↵David Friedman2015-02-233-344/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | page. Bug: 18257984" into lmp-docs * commit '18c8a35fa4e775c3b515e739b0f32981395914ad': Update Google Play brand-info page. Bug: 18257984
| * | Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docsDavid Friedman2015-02-233-344/+59
| |\ \
| | * | Update Google Play brand-info page.David Friedman2015-02-203-344/+59
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18257984 Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c
* | | | am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions ↵Rich Slogar2015-02-211-7/+85
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | page v2" into lmp-docs * commit '5b60b1a0401afb4d1addf53ca40facb5b5f6c0ee': docs: android plugin revisions page v2
| * | | Merge "docs: android plugin revisions page v2" into lmp-docsRich Slogar2015-02-211-7/+85
| |\ \ \
| | * | | docs: android plugin revisions page v2Rich Slogar2015-02-201-7/+85
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2
* | | | | am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older ↵Luan Nguyen2015-02-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | devices section not expanding" into lmp-docs * commit '969848c4484b5430e00cac7c317cc5e35e7ec8f5': docs: Fix issue with older devices section not expanding
| * | | | Merge "docs: Fix issue with older devices section not expanding" into lmp-docsLuan Nguyen2015-02-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | docs: Fix issue with older devices section not expandingLuan Nguyen2015-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 19381237 Change-Id: I3d881f36b8aac6f6a845141b33e8e383356ffcb4
* | | | | am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle ↵kmccormick2015-02-192-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | brackets in code snippets. * commit 'a4fce24d6652e3869f70ca9f549ef45661608114': Doc Update: fixed unescaped angle brackets in code snippets.
| * | | | Doc Update: fixed unescaped angle brackets in code snippets.kmccormick2015-02-192-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie265dd58fb3a5fcffe955992dea7a1f9417a27d7
* | | | | am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" ↵Rich Slogar2015-02-194-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit 'cc883a1ff3d46ffc3cb59915d6d292f91bd984a2': docs: mipmap link updates
| * | | | Merge "docs: mipmap link updates" into lmp-docsRich Slogar2015-02-194-4/+4
| |\ \ \ \
| | * | | | docs: mipmap link updatesRich Slogar2015-02-194-4/+4
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa
* | | | | am f213a8c9: am 14bb9188: am f4f059d4: docs: studio 1.1 downloadsRich Slogar2015-02-191-16/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f213a8c980109f9be940236f19a5b79b9be2b007': docs: studio 1.1 downloads
| * | | | docs: studio 1.1 downloadsRich Slogar2015-02-191-16/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: I663a91baba3b0a1e51aa8e3dbc991f067d0c255c
* | | | | am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc ↵Joe Fernandez2015-02-191-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | from C2DM doc * commit '6f5d4bd8c3f780744f0c739cbe168f764fbf824f': docs: remove reference to GCM doc from C2DM doc
| * | | | docs: remove reference to GCM doc from C2DM docJoe Fernandez2015-02-181-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic044916487d56bab22e30b24392890b97acf9d44
* | | | | am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updatesRich Slogar2015-02-186-99/+212
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '708959b5326b7877553397fc17237e02f0d3adb1': docs: lint inspection updates
| * | | | docs: lint inspection updatesRich Slogar2015-02-186-99/+212
| |/ / / | | | | | | | | | | | | Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
* | | | am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into ↵Rich Slogar2015-02-183-3/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs automerge: 0f60943 * commit '0f609432222e9eb946bfaa2bee45301324b97311': docs: note to install linux packages
| * | | Merge "docs: note to install linux packages" into lmp-docsRich Slogar2015-02-173-3/+8
| |\ \ \
| | * | | docs: note to install linux packagesRich Slogar2015-02-023-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/2845850 b.android 98328 Change-Id: I23224f24cb0b42ec4ffb3829e2246628da140f8c
* | | | | am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run ↵Rich Slogar2015-02-182-44/+64
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project updates" into lmp-docs automerge: 5f31276 * commit '5f3127620255167469fcba3d21334eb23217611d': docs: studio training basics create and run project updates
| * | | | Merge "docs: studio training basics create and run project updates" into ↵Rich Slogar2015-02-172-44/+64
| |\ \ \ \ | | | | | | | | | | | | | | | | | | lmp-docs
| | * | | | docs: studio training basics create and run project updatesRich Slogar2015-01-302-44/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18742781 Change-Id: I80a207e24330c1b073934d671b3b9c94b0fb28e0
* | | | | | am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and ↵Andrew Solovay2015-02-182-3/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot be truncated." into lmp-docs automerge: 8d5ba01 * commit '8d5ba018266448caeb44637d273f63dbff2956af': docs: Noted that purchaseToken is long and cannot be truncated.
| * | | | | Merge "docs: Noted that purchaseToken is long and cannot be truncated." into ↵Andrew Solovay2015-02-172-3/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-docs
| | * | | | | docs: Noted that purchaseToken is long and cannot be truncated.Andrew Solovay2015-02-122-3/+16
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noted in reference and integration doc that the token for Google Play purchases may be up to 1,000 chars long, and the entire token must be returned (not abbreviated or truncated) to any method that needs it. See first comment for doc stage location. bug: 19099521 Change-Id: I0a0f187293ea522c218f6c3287b4c36ee6725a90
* | | | | | am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into ↵Rich Sloager2015-02-182-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs automerge: d225cfc * commit 'd225cfc811fd2f4041195b6df1094e2a8a13d3be': Revert "docs: studio proxy setup"
| * | | | | Merge "Revert "docs: studio proxy setup"" into lmp-docsRich Sloager2015-02-172-0/+0
| |\ \ \ \ \
| | * | | | | Revert "docs: studio proxy setup"Rich Sloager2015-02-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c3e0107ce30aa676011bf7ea0daa9c8db750f024. Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
* | | | | | | am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docsRich Slogar2015-02-186-26/+153
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 797c989 * commit '797c989e3be0d081098866206b0e5829a7fe2ce2': docs: site mipmap folder updates
| * | | | | | Merge "docs: site mipmap folder updates" into lmp-docsRich Slogar2015-02-176-26/+153
| |\ \ \ \ \ \
| | * | | | | | docs: site mipmap folder updatesRich Slogar2015-02-176-26/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/12874352 Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
* | | | | | | | am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docsRich Slogar2015-02-186-49/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: c694604 * commit 'c694604ec58fc16f2526c8689b0def0fbcfb6fc7': docs: studio mipmap update
| * | | | | | | Merge "docs: studio mipmap update" into lmp-docsRich Slogar2015-02-176-49/+41
| |\ \ \ \ \ \ \