summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | docs: March 2015 Dashboard updateJoe Fernandez2015-03-021-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361
* | | | | | | | | | am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version ↵Rich Slogar2015-02-272-6/+74
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs * commit '191131d4494f0b6c51463ae9e771672bad5c970a': docs: gradle plugin version update
| * | | | | | | | | am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into ↵Rich Slogar2015-02-272-6/+74
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit '50e8b020f69687f11a0abce4ec5312697f9a1449': docs: gradle plugin version update
| | * | | | | | | | am a83f6445: Merge "docs: gradle plugin version update" into lmp-docsRich Slogar2015-02-272-6/+74
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a83f64451d55882366491e66c7479f194e0625ea': docs: gradle plugin version update
| | | * | | | | | | Merge "docs: gradle plugin version update" into lmp-docsRich Slogar2015-02-272-6/+74
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | docs: gradle plugin version updateRich Slogar2015-02-272-6/+74
| | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b.android 153270 Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc
* | | | | | | | | | am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb ↵Luan Nguyen2015-02-271-0/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging on Wear device" into lmp-docs * commit 'd57871e00d77bc852948de30a01b6856a6cfeb9b': docs: Add steps to enable adb debugging on Wear device
| * | | | | | | | | am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on ↵Luan Nguyen2015-02-271-0/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wear device" into lmp-docs * commit '8aa8960edb10089570acd5d3b19cfd9be7253fab': docs: Add steps to enable adb debugging on Wear device
| | * | | | | | | | am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" ↵Luan Nguyen2015-02-271-0/+9
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit 'a464d409f68ca9a59ac4261edd46866ae2af68bf': docs: Add steps to enable adb debugging on Wear device
| | | * | | | | | | Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docsLuan Nguyen2015-02-271-0/+9
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | docs: Add steps to enable adb debugging on Wear deviceLuan Nguyen2015-02-251-0/+9
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19425073 Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056
* | | | | | | | | | am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of ↵Ryosuke Matsuuchi2015-02-274-2/+195
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DAC/distribute/ page." into lmp-docs * commit 'b859313312a85285c2c243a5e58d133e308ee590': doc: Add Japanese version of DAC/distribute/ page.
| * | | | | | | | | am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of ↵Ryosuke Matsuuchi2015-02-274-2/+195
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DAC/distribute/ page." into lmp-docs * commit 'c1120b459eb1ecabd54966cef1873f0f0707382d': doc: Add Japanese version of DAC/distribute/ page.
| | * | | | | | | | am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into ↵Ryosuke Matsuuchi2015-02-274-2/+195
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db': doc: Add Japanese version of DAC/distribute/ page.
| | | * | | | | | | Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docsRyosuke Matsuuchi2015-02-274-2/+195
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | doc: Add Japanese version of DAC/distribute/ page.Ryosuke Matsuuchi2015-02-184-1/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18847144 Change-Id: I7bd98c381d8d58367862daedb7aaedfb0112b9d1
* | | | | | | | | | | am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub ↵Andrew Solovay2015-02-275-48/+222
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrade/downgrade and manual renewal * commit '3daee37705d23a0f91680aa954e4bcdb2dfdf4e8': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| * | | | | | | | | am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade ↵Andrew Solovay2015-02-275-48/+222
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and manual renewal * commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | * | | | | | | | am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewalAndrew Solovay2015-02-275-48/+222
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | | * | | | | | | docs: Documented new IABv5 sub upgrade/downgrade and manual renewalAndrew Solovay2015-02-265-48/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-devSanket Padawe2015-02-261-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Changing usage of carrier name field of SubInfoRecordSanket Padawe2015-02-241-1/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19476304 Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
* | | | | | | | | | Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-devJason Monk2015-02-261-3/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Keyguard: Use plmn/spn broadcast when no SIMsJason Monk2015-02-241-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keyguard needs to show either 'emergency calls only' or 'no service' depending on whether there is service available, so try to pull this from the old sticky broadcast containing plmn/spn. Bug: 19476978 Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
* | | | | | | | | | | am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into ↵Rich Slogar2015-02-261-16/+24
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit '6bb23d627f608461f6dd5f40308ac176a327d99b': docs: 9patch tool update
| * | | | | | | | | | am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docsRich Slogar2015-02-261-16/+24
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '299366847f50059fb3e13b573247d9a05d29eb3c': docs: 9patch tool update
| | * | | | | | | | | am 0a504745: Merge "docs: 9patch tool update" into lmp-docsRich Slogar2015-02-261-16/+24
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d': docs: 9patch tool update
| | | * | | | | | | | Merge "docs: 9patch tool update" into lmp-docsRich Slogar2015-02-261-16/+24
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | docs: 9patch tool updateRich Slogar2015-02-181-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18019306 Change-Id: I8cd84afe47d0d3ac344f0581075c015049777e27
* | | | | | | | | | | | am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk ↵Rich Slogar2015-02-251-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link" into lmp-docs * commit '1836eea08229dda72ff89d24f75f9f4948be957e': docs: remove exploring sdk link
| * | | | | | | | | | | am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docsRich Slogar2015-02-251-12/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '411046324743055e9eef3b04109c998b5354b496': docs: remove exploring sdk link
| | * | | | | | | | | | am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docsRich Slogar2015-02-251-12/+13
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0': docs: remove exploring sdk link
| | | * | | | | | | | | Merge "docs: remove exploring sdk link" into lmp-docsRich Slogar2015-02-251-12/+13
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | docs: remove exploring sdk linkRich Slogar2015-02-231-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b.android 153523 Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
* | | | | | | | | | | | | am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux ↵Rich Slogar2015-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packages v2 update" into lmp-docs * commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194': docs: note to install linux packages v2 update
| * | | | | | | | | | | | am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 ↵Rich Slogar2015-02-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs * commit '84994e876e728fa57f06d803f7c4abfbc9df40db': docs: note to install linux packages v2 update
| | * | | | | | | | | | | am db2ebca7: Merge "docs: note to install linux packages v2 update" into ↵Rich Slogar2015-02-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91': docs: note to install linux packages v2 update
| | | * | | | | | | | | | Merge "docs: note to install linux packages v2 update" into lmp-docsRich Slogar2015-02-251-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | docs: note to install linux packages v2 updateRich Slogar2015-02-241-1/+1
| | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b.android 155803 Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834
* | | | | | | | | | | | | Merge "Remove TrustAgent whitelisting API" into lmp-mr1-devJim Miller2015-02-253-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove TrustAgent whitelisting APIJim Miller2015-02-243-4/+2
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug caught late in the release, this API is broken and should be removed from API 22 because it's too late for a fix and there's no workaround. Bug 19461292 Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
* | | | | | | | | | | | | 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
| * | | | | | | | | | | | am c427b721: am 41418826: Merge "docs: Android for Work developer landing ↵Joe Fernandez2015-02-254-50/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page" into lmp-docs * commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528': docs: Android for Work developer landing page
| | * | | | | | | | | | | am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docsJoe Fernandez2015-02-254-50/+77
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '414188262311ec48235095a5dec622b24f7e69ef': 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
| * | | | | | | | | | | | am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy ↵Andrew Solovay2015-02-252-1/+345
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Controller * commit '790b1bc864d9066ff691b0e12a4e14ef85566c50': docs: New doc for creating an AfW Work Policy Controller
| | * | | | | | | | | | | am d3cd0948: docs: New doc for creating an AfW Work Policy ControllerAndrew Solovay2015-02-252-1/+345
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad': 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