Mark Salyzyn
ca50cd2114
jni: Add paranoia regarding android_logger_list_read
...
Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
2015-02-26 14:49:17 -08:00
Andrew Solovay
b5e00e5c3d
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
2015-02-26 14:34:48 -08:00
Deepanshu Gupta
d68448a601
Fix codestyle for switch statements.
...
Fix intellij's codestyle settings for indenting switch/case statement.
Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
2015-02-26 14:32:30 -08:00
Jason Monk
057fd382cc
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
2015-02-26 21:59:06 +00:00
Sanket Padawe
025f093854
Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev
2015-02-26 21:58:28 +00:00
Jason Monk
9df42df2bc
Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
2015-02-26 21:54:23 +00:00
Geoff Mendal
70eb8077a2
Import translations. DO NOT MERGE
...
Change-Id: Ic79aace8bc91318a1d637c834ae3176ee221bead
Auto-generated-cl: translation import
2015-02-26 12:53:29 -08:00
Rich Slogar
0aae791d5a
am b8b1e076: am efda11e7: am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit 'b8b1e07668f684b734758fe2084496466d671339':
docs: 9patch tool update
2015-02-26 18:44:39 +00:00
Rich Slogar
b8b1e07668
am efda11e7: am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit 'efda11e708cf39ac408fc1189f9a58b3c66b0831':
docs: 9patch tool update
2015-02-26 18:37:38 +00:00
Rich Slogar
efda11e708
am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '328dc4288bc86b6f7a7db56d7bfb17053e94ec1c':
docs: 9patch tool update
2015-02-26 18:30:32 +00:00
Rich Slogar
328dc4288b
am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '6bb23d627f608461f6dd5f40308ac176a327d99b':
docs: 9patch tool update
2015-02-26 18:22:34 +00:00
Rich Slogar
6bb23d627f
am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
docs: 9patch tool update
2015-02-26 18:15:41 +00:00
Rich Slogar
299366847f
am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
...
* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
docs: 9patch tool update
2015-02-26 18:08:39 +00:00
Rich Slogar
0a504745b4
Merge "docs: 9patch tool update" into lmp-docs
2015-02-26 18:02:43 +00:00
Narayan Kamath
f1eaa12385
am 4d8caa55: am 8cba382f: Merge "Bad month value in DatePicker in Calendar Mode"
...
* commit '4d8caa557670626768aabb55d213f9d091433d73':
Bad month value in DatePicker in Calendar Mode
2015-02-26 17:56:52 +00:00
Narayan Kamath
4d8caa5576
am 8cba382f: Merge "Bad month value in DatePicker in Calendar Mode"
...
* commit '8cba382f04e4ead4a6b8c4a74216ddb383e8db91':
Bad month value in DatePicker in Calendar Mode
2015-02-26 17:49:19 +00:00
Narayan Kamath
8cba382f04
Merge "Bad month value in DatePicker in Calendar Mode"
2015-02-26 17:42:24 +00:00
You Kim
49e6c4adbf
Bad month value in DatePicker in Calendar Mode
...
Calendar MONTH field is zero based. Use predefined month.
Change-Id: I957bf385dc8e877e8698dacad68808f4d9d8a6d0
2015-02-26 19:06:16 +09:00
Jason Sams
add04be7c8
Fix crash when updating adapter offsets.
...
Change-Id: I0a6923e387f9743a06cc2c4c67995a79789d4cdd
2015-02-25 16:42:00 -08:00
Miao Wang
c8e237e271
[Renderscript] JAVA API update for Allocation.CopyTo
...
add the following functions to make it more symmetric to copyFrom().
- copy1DRangeToUnchecked, copy1DRangeTo
- copy2DRangeToUnchecked, copy2DRangeTo
- copy3DRangeToUnchecked, copy3DRangeTo
- setFromFieldPacker, 2D and 3D variants
- copyElementTo, (1D, 2D & 3D)
Change-Id: I6b896123e1c00cead552aa5b31a701b15dd70f85
2015-02-25 16:41:09 -08:00
Rich Slogar
747e4da618
am fa514d69: am 5b3b1a17: am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit 'fa514d6907db6c96ac662b6e06897bcc020c6a43':
docs: remove exploring sdk link
2015-02-25 23:52:56 +00:00
Rich Slogar
fdbda56a2d
am 1e72a9b2: am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit '1e72a9b2477bb350cb7922ad4f166eba62b0bbdd':
docs: note to install linux packages v2 update
2015-02-25 23:52:50 +00:00
Rich Slogar
fa514d6907
am 5b3b1a17: am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit '5b3b1a17da0f59ee7a0b4c4defb1993b9de85b3f':
docs: remove exploring sdk link
2015-02-25 23:46:45 +00:00
Rich Slogar
1e72a9b247
am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit '2ed2c141f338bef0f11ae93167b7c810bbbd645d':
docs: note to install linux packages v2 update
2015-02-25 23:46:41 +00:00
Rich Slogar
2868e7260a
docs: build image updates
...
Change-Id: I9bc252b2f3a43085b69b1177242cc8b1fc0e0662
2015-02-25 15:39:07 -08:00
Rich Slogar
5b3b1a17da
am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit 'bd409177ec6b422e18d9e0c94ffab86dfd368976':
docs: remove exploring sdk link
2015-02-25 23:38:55 +00:00
Rich Slogar
2ed2c141f3
am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit '81049aff4bad07427dc18543be1c759e16267a63':
docs: note to install linux packages v2 update
2015-02-25 23:38:51 +00:00
Rich Slogar
bd409177ec
am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit '1836eea08229dda72ff89d24f75f9f4948be957e':
docs: remove exploring sdk link
2015-02-25 23:32:51 +00:00
Rich Slogar
81049aff4b
am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194':
docs: note to install linux packages v2 update
2015-02-25 23:32:46 +00:00
Rich Slogar
1836eea082
am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit '411046324743055e9eef3b04109c998b5354b496':
docs: remove exploring sdk link
2015-02-25 23:25:11 +00:00
Rich Slogar
f8a95b0b6f
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
2015-02-25 23:25:07 +00:00
Rich Slogar
4110463247
am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
...
* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
docs: remove exploring sdk link
2015-02-25 23:17:31 +00:00
Rich Slogar
84994e876e
am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
docs: note to install linux packages v2 update
2015-02-25 23:17:23 +00:00
Rich Slogar
eedf6ad8ce
Merge "docs: remove exploring sdk link" into lmp-docs
2015-02-25 23:12:37 +00:00
Rich Slogar
db2ebca7ed
Merge "docs: note to install linux packages v2 update" into lmp-docs
2015-02-25 23:11:24 +00:00
Luan Nguyen
43836ac798
docs: Add steps to enable adb debugging on Wear device
...
bug: 19425073
Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056
2015-02-25 15:09:29 -08:00
Dan Albert
72e7217d0b
am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."
...
* commit 'b7121d703067b440281f27a40b8273b17bef1e62':
Update autogenerated gl functions.
2015-02-25 23:07:47 +00:00
Dan Albert
b7121d7030
am b78cce6f: Merge "Update autogenerated gl functions."
...
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
Update autogenerated gl functions.
2015-02-25 23:00:52 +00:00
Dan Albert
b78cce6f92
Merge "Update autogenerated gl functions."
2015-02-25 22:50:25 +00:00
Filip Gruszczynski
0fbcc7086f
am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
...
* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
Burn in protection.
2015-02-25 21:40:38 +00:00
Filip Gruszczynski
1e74b5d6b0
Merge "Burn in protection." into lmp-mr1-modular-dev
2015-02-25 21:31:53 +00:00
Filip Gruszczynski
d2e8640c2c
Burn in protection.
...
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
2015-02-25 12:22:49 -08:00
Griff Hazen
892609ad34
am aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev
...
* commit 'aeffc9cebd4e97889f5b2f61de38c60b83535ffa':
Always draw the circular emulator overlay with square dimensions
2015-02-25 19:47:12 +00:00
Griff Hazen
aeffc9cebd
Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev
2015-02-25 19:39:56 +00:00
Mark Salyzyn
f7b6804952
am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
...
* commit '533758c1fb2dcf5b50db46b60d26ecae72fc71ee':
jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:19:27 +00:00
Mark Salyzyn
533758c1fb
am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
...
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:13:12 +00:00
Mark Salyzyn
0d8b97a44e
Merge "jni: switch to ANDROID_LOG_* mode flags"
2015-02-25 19:04:24 +00:00
Filip Gruszczynski
cf8c112ed8
am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
...
* commit '01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719':
Force translucency from windowIsTranslucent on SwipeDismissLayout.
2015-02-25 18:44:57 +00:00
Filip Gruszczynski
01dd0e8654
Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
2015-02-25 18:40:20 +00:00
Jim Miller
b060f018ef
am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
Remove TrustAgent whitelisting API
2015-02-25 18:23:20 +00:00
