OSDN Git Service
Rich Slogar [Thu, 5 Mar 2015 19:53:00 +0000 (19:53 +0000)]
am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
bc669e3f555519f641102b759a04a01ac5c10cad':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:46:12 +0000 (19:46 +0000)]
am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
dad1cbebfabf421efc90d366d9c4fd67becf930f':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:39:47 +0000 (19:39 +0000)]
am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
9f485e971e06dad399dd70712787f4c30da9515e':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am
4aba69a8: docs: sdk tools date fix
* commit '
4aba69a8a7f58541ce76429252dd0c9650b40f35':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
smain@google.com [Thu, 5 Mar 2015 06:21:05 +0000 (06:21 +0000)]
am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
8b2be54a629e4567152d8b0e6c81332632b0b877':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
182059f875bedc778a3ce9710a4f634197d1e959':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
ca10a4352f07652d82da59f6c1630e8607d82dda':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
Eric Gilmore [Thu, 5 Mar 2015 00:55:48 +0000 (00:55 +0000)]
am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
498691d2641deb1ca30938c7777a9a63882ffd87':
Fixing broken link per b/
19503824.
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 00:40:06 +0000 (00:40 +0000)]
am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
John Spurlock [Wed, 4 Mar 2015 23:01:52 +0000 (23:01 +0000)]
am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit
3d332f4e67a484abe597576bf329d89655afe720)
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '
83a63bac' into manualmerge
Eric Gilmore [Wed, 4 Mar 2015 17:53:31 +0000 (17:53 +0000)]
am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:40:15 +0000 (17:40 +0000)]
Merge "Fixing broken link per b/
19503824." into lmp-docs
Craig Mautner [Wed, 4 Mar 2015 16:15:35 +0000 (16:15 +0000)]
am
8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
* commit '
8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
Craig Mautner [Wed, 4 Mar 2015 16:09:28 +0000 (16:09 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
Eric Gilmore [Tue, 3 Mar 2015 20:10:19 +0000 (12:10 -0800)]
Fixing broken link per b/
19503824.
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
Joe Fernandez [Tue, 3 Mar 2015 17:54:27 +0000 (17:54 +0000)]
am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
246a3a4a797edf5850073ec8f6b8aa997947d09b':
Minor typo fixes in managed profile Javadoc reference pages.
Rich Slogar [Tue, 3 Mar 2015 17:54:23 +0000 (17:54 +0000)]
am
a81ed3cd: docs: support library updates for sdk 22
* commit '
a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
docs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 17:54:18 +0000 (17:54 +0000)]
am
e0ce0f2c: docs: platform revisions 5.1
* commit '
e0ce0f2cc28720316902303209f923e699d604f7':
docs: platform revisions 5.1
Joe Fernandez [Tue, 3 Mar 2015 17:54:14 +0000 (17:54 +0000)]
am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
* commit '
546433328d0b017419bd3d5ff6ee5708645455db':
Doc change: Add diff report for API 22.
Joe Fernandez [Tue, 3 Mar 2015 17:54:10 +0000 (17:54 +0000)]
am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
* commit '
2ba57444e8368ab66ae43fe2304e39dc76fc64ff':
docs: update Android docs build to include API 22, Android 5.1
Rich Slogar [Tue, 3 Mar 2015 17:54:06 +0000 (17:54 +0000)]
am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
3f3f842cc06e0103041e7dae4c3f9fbf1f7ab9c0':
docs: sdk tools 24.1 update
Joe Fernandez [Tue, 3 Mar 2015 17:54:02 +0000 (17:54 +0000)]
am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit '
45ef73b4e97a0621ba5f26eef280f6550c81338d':
docs: Add Android 5.1 to the uses-sdk manifest docs
Joe Fernandez [Tue, 3 Mar 2015 17:53:58 +0000 (17:53 +0000)]
am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
* commit '
5c6476aa507577422557d8434a7ce19937cfccfd':
docs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Tue, 3 Mar 2015 06:29:33 +0000 (06:29 +0000)]
am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
14fcef3bf02f46a057676d7a6d755daee735c4ea':
Minor typo fixes in managed profile Javadoc reference pages.
Joe Fernandez [Tue, 3 Mar 2015 06:22:42 +0000 (06:22 +0000)]
am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
c4418980a083c1cd26b789297f084e03036b5fdd':
Minor typo fixes in managed profile Javadoc reference pages.
Joe Fernandez [Tue, 3 Mar 2015 06:15:29 +0000 (06:15 +0000)]
am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '
a31378dc49868412a2e632bcc46a44877a9b397f':
Minor typo fixes in managed profile Javadoc reference pages.
Joe Fernandez [Tue, 3 Mar 2015 06:11:49 +0000 (06:11 +0000)]
Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 00:09:21 +0000 (16:09 -0800)]
docs: support library updates for sdk 22
Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c
Rich Slogar [Tue, 3 Mar 2015 01:54:10 +0000 (17:54 -0800)]
docs: platform revisions 5.1
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
Shishir Agrawal [Tue, 3 Mar 2015 02:54:12 +0000 (02:54 +0000)]
am
bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
* commit '
bcced5b834e49bf3a0b57a0009958ba061d31e76':
Fix incorrect condition for sub id check.
Joe Fernandez [Tue, 3 Mar 2015 02:03:43 +0000 (02:03 +0000)]
Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 01:42:40 +0000 (01:42 +0000)]
Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
Rich Slogar [Tue, 3 Mar 2015 01:27:07 +0000 (01:27 +0000)]
am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
d54fe112a24ec3a692d35a4ccf1f73fa5caaaf5e':
docs: sdk tools 24.1 update
Andrew Solovay [Tue, 3 Mar 2015 00:37:59 +0000 (16:37 -0800)]
Minor typo fixes in managed profile Javadoc reference pages.
See first comment for stage location.
bug:
19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
Rich Slogar [Tue, 3 Mar 2015 01:20:33 +0000 (01:20 +0000)]
am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
2cbda290f66b5a17d3542ada26f7e91b3893f72d':
docs: sdk tools 24.1 update
Rich Slogar [Tue, 3 Mar 2015 01:13:36 +0000 (01:13 +0000)]
am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
* commit '
69b58e74e087159ed5950632b4ab3738a841c633':
docs: sdk tools 24.1 update
Rich Slogar [Tue, 3 Mar 2015 01:07:38 +0000 (01:07 +0000)]
Merge "docs: sdk tools 24.1 update" into lmp-docs
Joe Fernandez [Tue, 3 Mar 2015 01:02:54 +0000 (01:02 +0000)]
Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 00:56:42 +0000 (00:56 +0000)]
Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 00:43:14 +0000 (16:43 -0800)]
docs: Add Android 5.1 to the uses-sdk manifest docs
Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267
Joe Fernandez [Mon, 2 Mar 2015 23:53:38 +0000 (15:53 -0800)]
docs: update Android docs build to include API 22, Android 5.1
Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0
Joe Fernandez [Fri, 27 Feb 2015 05:55:07 +0000 (21:55 -0800)]
docs: Android 5.1 API Release notes (Lollipop MR1)
Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0
Shishir Agrawal [Mon, 2 Mar 2015 22:32:16 +0000 (22:32 +0000)]
Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:57:33 +0000 (19:57 +0000)]
am
f2c1c096: am
6ed9b75a: am
72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
* commit '
f2c1c09683a5cfa23e8394fe5a10e84803f4168b':
Correct PorterDuff filters.
Deepanshu Gupta [Mon, 2 Mar 2015 19:57:29 +0000 (19:57 +0000)]
am
2022b0ff: am
d003e813: am
369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '
2022b0ffdd7c91e8435bc204ad9aedd658254166':
Fix codestyle for switch statements.
Deepanshu Gupta [Mon, 2 Mar 2015 19:57:25 +0000 (19:57 +0000)]
am
aff0ec93: am
81449b2c: am
10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
* commit '
aff0ec93f2a734a68673f1f7337533b6d93cb256':
Better error msg for StateList/Hexadecimal Color.
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:33 +0000 (19:52 +0000)]
am
6ed9b75a: am
72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
* commit '
6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
Correct PorterDuff filters.
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:29 +0000 (19:52 +0000)]
am
d003e813: am
369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '
d003e8133167f2b6741f8eb925fdc9f77c2800a5':
Fix codestyle for switch statements.
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:25 +0000 (19:52 +0000)]
am
81449b2c: am
10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
* commit '
81449b2c4a63392bff22d77f331f4db52011884b':
Better error msg for StateList/Hexadecimal Color.
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:51 +0000 (19:44 +0000)]
am
72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
* commit '
72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
Correct PorterDuff filters.
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:47 +0000 (19:44 +0000)]
am
369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '
369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
Fix codestyle for switch statements.
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:43 +0000 (19:44 +0000)]
am
10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
* commit '
10d620ff2c4770e926b693e833105e8dbbd5fa86':
Better error msg for StateList/Hexadecimal Color.
Deepanshu Gupta [Mon, 2 Mar 2015 19:40:12 +0000 (19:40 +0000)]
Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:37:30 +0000 (19:37 +0000)]
Merge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:36:57 +0000 (19:36 +0000)]
Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:32:26 +0000 (19:32 +0000)]
am
07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
* commit '
07d453fa091ab407864d474f9bf2a5167686010a':
Add status bar time for 5.1
Deepanshu Gupta [Mon, 2 Mar 2015 19:26:14 +0000 (19:26 +0000)]
Merge "Add status bar time for 5.1" into lmp-mr1-dev
Joe Fernandez [Mon, 2 Mar 2015 18:14:24 +0000 (18:14 +0000)]
am
8243b74f: am
6a0c8084: am
9b94a539: am
97a1173b: docs: March 2015 Dashboard update
* commit '
8243b74f7f19d57455f7ff9188f539d0361139db':
docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 18:04:39 +0000 (18:04 +0000)]
am
6a0c8084: am
9b94a539: am
97a1173b: docs: March 2015 Dashboard update
* commit '
6a0c808487392f6cd8d62ad4abb51c0f077ace0f':
docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:14:51 +0000 (17:14 +0000)]
am
9b94a539: am
97a1173b: docs: March 2015 Dashboard update
* commit '
9b94a5399845efc9d52ebf37e8fde320885c07c8':
docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:09:01 +0000 (17:09 +0000)]
am
97a1173b: docs: March 2015 Dashboard update
* commit '
97a1173b63be900ab5aed694e8022c60f3817fa0':
docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 16:53:54 +0000 (08:53 -0800)]
docs: March 2015 Dashboard update
Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361
Rich Slogar [Fri, 27 Feb 2015 23:13:24 +0000 (23:13 +0000)]
am
37f207e1: am
191131d4: am
50e8b020: am
a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
* commit '
37f207e118f1de7442a8874f7ebc6db643d0edcc':
docs: gradle plugin version update
Rich Slogar [Thu, 26 Feb 2015 23:10:54 +0000 (15:10 -0800)]
docs: sdk tools 24.1 update
Change-Id: I995c1012c22b8b6fa45c4cfd33f90b8b82ddb0eb
Rich Slogar [Fri, 27 Feb 2015 22:50:34 +0000 (22:50 +0000)]
am
191131d4: am
50e8b020: am
a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
* commit '
191131d4494f0b6c51463ae9e771672bad5c970a':
docs: gradle plugin version update
Rich Slogar [Fri, 27 Feb 2015 22:43:42 +0000 (22:43 +0000)]
am
50e8b020: am
a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
* commit '
50e8b020f69687f11a0abce4ec5312697f9a1449':
docs: gradle plugin version update
Rich Slogar [Fri, 27 Feb 2015 22:37:17 +0000 (22:37 +0000)]
am
a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
* commit '
a83f64451d55882366491e66c7479f194e0625ea':
docs: gradle plugin version update
Rich Slogar [Fri, 27 Feb 2015 22:31:32 +0000 (22:31 +0000)]
Merge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Mon, 23 Feb 2015 18:22:22 +0000 (10:22 -0800)]
docs: gradle plugin version update
b.android 153270
Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc
Luan Nguyen [Fri, 27 Feb 2015 17:00:25 +0000 (17:00 +0000)]
am
dedba01a: am
d57871e0: am
8aa8960e: am
a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
* commit '
dedba01ac8b85d535171a910aa6b72ea9ce4498c':
docs: Add steps to enable adb debugging on Wear device
Ryosuke Matsuuchi [Fri, 27 Feb 2015 17:00:20 +0000 (17:00 +0000)]
am
d4cdf18e: am
b8593133: am
c1120b45: am
8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '
d4cdf18e1c763c2aaedbb4f0cab3657db2adc097':
doc: Add Japanese version of DAC/distribute/ page.
Andrew Solovay [Fri, 27 Feb 2015 17:00:16 +0000 (17:00 +0000)]
am
3a5b0815: am
3daee377: am
7f26f2b9: am
b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
* commit '
3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Luan Nguyen [Fri, 27 Feb 2015 16:53:47 +0000 (16:53 +0000)]
am
d57871e0: am
8aa8960e: am
a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
* commit '
d57871e00d77bc852948de30a01b6856a6cfeb9b':
docs: Add steps to enable adb debugging on Wear device
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:53:42 +0000 (16:53 +0000)]
am
b8593133: am
c1120b45: am
8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '
b859313312a85285c2c243a5e58d133e308ee590':
doc: Add Japanese version of DAC/distribute/ page.
Andrew Solovay [Fri, 27 Feb 2015 16:53:37 +0000 (16:53 +0000)]
am
3daee377: am
7f26f2b9: am
b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
* commit '
3daee37705d23a0f91680aa954e4bcdb2dfdf4e8':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Luan Nguyen [Fri, 27 Feb 2015 16:46:56 +0000 (16:46 +0000)]
am
8aa8960e: am
a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
* commit '
8aa8960edb10089570acd5d3b19cfd9be7253fab':
docs: Add steps to enable adb debugging on Wear device
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:46:53 +0000 (16:46 +0000)]
am
c1120b45: am
8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '
c1120b459eb1ecabd54966cef1873f0f0707382d':
doc: Add Japanese version of DAC/distribute/ page.
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
Luan Nguyen [Fri, 27 Feb 2015 16:37:46 +0000 (16:37 +0000)]
am
a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
* commit '
a464d409f68ca9a59ac4261edd46866ae2af68bf':
docs: Add steps to enable adb debugging on Wear device
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:37:42 +0000 (16:37 +0000)]
am
8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '
8f0e9c7593fee981fc4b3831aae76a1f20e236db':
doc: Add Japanese version of DAC/distribute/ page.
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
Luan Nguyen [Fri, 27 Feb 2015 15:07:01 +0000 (15:07 +0000)]
Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
Lorenzo Colitti [Fri, 27 Feb 2015 07:09:23 +0000 (07:09 +0000)]
Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev
Lorenzo Colitti [Wed, 25 Feb 2015 16:25:36 +0000 (01:25 +0900)]
Separate NAT from forwarding.
Bug:
19500693
Change-Id: I39878644e21d51def1c31d1857e815f473ef0938
Ryosuke Matsuuchi [Fri, 27 Feb 2015 03:41:48 +0000 (03:41 +0000)]
Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
Deepanshu Gupta [Fri, 27 Feb 2015 03:29:36 +0000 (19:29 -0800)]
Add status bar time for 5.1
Change-Id: I9469cdbbc5cbfe5cb99d9c4ee6f4e299246d409f
Lorenzo Colitti [Fri, 27 Feb 2015 00:46:12 +0000 (00:46 +0000)]
Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev
Deepanshu Gupta [Thu, 26 Feb 2015 22:34:57 +0000 (14:34 -0800)]
Correct PorterDuff filters.
1. Remove unused modes - makes the class more manageable, and missing
modes can always be readded from the git history.
2. Reuse the existing BlendComposite instances where possible.
3. Fix incorrect alpha computation for multiply mode.
4. Change the alpha computation for all blend modes to compenstate for
the fact that the color filter image that we create extends beyond the
image it is inteded to be applied to.
Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
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
Deepanshu Gupta [Thu, 26 Feb 2015 22:32:30 +0000 (14:32 -0800)]
Fix codestyle for switch statements.
Fix intellij's codestyle settings for indenting switch/case statement.
Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
Sanket Padawe [Thu, 26 Feb 2015 22:09:10 +0000 (22:09 +0000)]
am
025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev
* commit '
025f0938544bae3262acc24e9c6031b6de88901d':
Changing usage of carrier name field of SubInfoRecord
Jason Monk [Thu, 26 Feb 2015 21:58:39 +0000 (21:58 +0000)]
am
9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
* commit '
9df42df2bca0a7a91d813b19e084069675d4057b':
Keyguard: Use plmn/spn broadcast when no SIMs
OSDN Git Service
