OSDN Git Service
Tenghui Zhu [Wed, 27 May 2015 21:01:21 +0000 (21:01 +0000)]
am
f6921241: am
01d1acc3: Merge "AnimatedVectorDrawable Attr proof of concept" into mnc-dev
* commit '
f6921241eb1ae9aa22ace909ff05ea1013fe081c':
AnimatedVectorDrawable Attr proof of concept
Rich Slogar [Wed, 27 May 2015 21:01:16 +0000 (21:01 +0000)]
am
cab811a2: am
3c651151: am
986cc34c: am
4575cadc: docs: supportlib icon fix
* commit '
cab811a2180b13ad0b18332651b04ac61da184bb':
docs: supportlib icon fix
Luan Nguyen [Wed, 27 May 2015 21:01:11 +0000 (21:01 +0000)]
am
37e54820: am
e564d21f: am
60877970: am
5904628c: docs: Remove Voice Camera sample.
* commit '
37e54820878d1c270e4707eb6b6a3c316e4d170d':
docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 21:01:06 +0000 (21:01 +0000)]
am
54eb4368: am
c6049ee6: am
f42c6dfb: am
5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs
* commit '
54eb436886e9a5f92cfb655c5ac705a2296b555d':
docs: Remove 's' from Confirm Credential sample.
Joe Fernandez [Wed, 27 May 2015 21:01:00 +0000 (21:01 +0000)]
am
f84d477b: am
b9b556cf: am
3d3414e4: am
47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
* commit '
f84d477b0fa0429f1fc3f037eb8671c8c6275c1a':
docs: M Preview - App links fix update
Luan Nguyen [Wed, 27 May 2015 21:00:55 +0000 (21:00 +0000)]
am
3cd88798: am
bbebc86f: am
35c53c54: am
27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
* commit '
3cd8879801e1a904ae14228eba1a5c784eef5b84':
docs: Update instructions to download samples in Android Studio.
Andrew Solovay [Wed, 27 May 2015 21:00:49 +0000 (21:00 +0000)]
am
229ce0f5: am
cd8190f1: am
30788ec8: am
f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
* commit '
229ce0f5a2e1214c94f530abff4c9bfbebefada3':
docs: Fixed targetSdkVersion in Auto Backup code snippets
Rich Slogar [Wed, 27 May 2015 21:00:44 +0000 (21:00 +0000)]
am
10308f25: am
f3a847b7: am
36462020: am
aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
* commit '
10308f257a12bc995b06d6d12e597fe94c86f49c':
docs: support library 22.2 duplicate link removal
Andrew Solovay [Wed, 27 May 2015 21:00:38 +0000 (21:00 +0000)]
am
c2d76c7a: am
bf7c14a2: am
b709b0e8: am
b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
* commit '
c2d76c7a2ae404049ec9df95676d8628a7674ab2':
docs: Fixing typo on Auto Backup for Apps page.
David Friedman [Wed, 27 May 2015 21:00:32 +0000 (21:00 +0000)]
am
2662827b: am
5cf6e731: am
9b57a20a: am
be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
* commit '
2662827bc8c7ced7a665af471f71fd160af9c301':
Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.
Quddus Chong [Wed, 27 May 2015 21:00:27 +0000 (21:00 +0000)]
am
944f34a0: am
21992dc0: am
c33eba1a: am
8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467" into mnc-preview-docs
* commit '
944f34a0a48f2b1d0c20b74b94d5223e372c67a1':
docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467
Tenghui Zhu [Wed, 27 May 2015 20:45:07 +0000 (20:45 +0000)]
am
01d1acc3: Merge "AnimatedVectorDrawable Attr proof of concept" into mnc-dev
* commit '
01d1acc3c7f2c15d926a5454c2d899135d3db318':
AnimatedVectorDrawable Attr proof of concept
Rich Slogar [Wed, 27 May 2015 20:45:03 +0000 (20:45 +0000)]
am
3c651151: am
986cc34c: am
4575cadc: docs: supportlib icon fix
* commit '
3c6511518f8d87cee56870bcd4bd01174e412af3':
docs: supportlib icon fix
Luan Nguyen [Wed, 27 May 2015 20:44:58 +0000 (20:44 +0000)]
am
e564d21f: am
60877970: am
5904628c: docs: Remove Voice Camera sample.
* commit '
e564d21f9acb85054f42a1e8f40cce9d5195066c':
docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:44:54 +0000 (20:44 +0000)]
am
c6049ee6: am
f42c6dfb: am
5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs
* commit '
c6049ee6eed445a2826483fa0aae2f7777b74ae5':
docs: Remove 's' from Confirm Credential sample.
Joe Fernandez [Wed, 27 May 2015 20:44:50 +0000 (20:44 +0000)]
am
b9b556cf: am
3d3414e4: am
47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
* commit '
b9b556cf3102583df35c4658dd3158fb6fc0e2db':
docs: M Preview - App links fix update
Luan Nguyen [Wed, 27 May 2015 20:44:45 +0000 (20:44 +0000)]
am
bbebc86f: am
35c53c54: am
27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
* commit '
bbebc86f6d82a07a1645b347cee5ea1f51707c5a':
docs: Update instructions to download samples in Android Studio.
Andrew Solovay [Wed, 27 May 2015 20:44:40 +0000 (20:44 +0000)]
am
cd8190f1: am
30788ec8: am
f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
* commit '
cd8190f16b6691eaeefa932cb68b1dc6f2665a0b':
docs: Fixed targetSdkVersion in Auto Backup code snippets
Rich Slogar [Wed, 27 May 2015 20:44:36 +0000 (20:44 +0000)]
am
f3a847b7: am
36462020: am
aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
* commit '
f3a847b7b45057e872b8acced83011b23c0031be':
docs: support library 22.2 duplicate link removal
Andrew Solovay [Wed, 27 May 2015 20:44:32 +0000 (20:44 +0000)]
am
bf7c14a2: am
b709b0e8: am
b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
* commit '
bf7c14a23a3a00ff9f0955ee1c7a6e6e0713fd1a':
docs: Fixing typo on Auto Backup for Apps page.
David Friedman [Wed, 27 May 2015 20:44:26 +0000 (20:44 +0000)]
am
5cf6e731: am
9b57a20a: am
be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
* commit '
5cf6e731602c1e94087a37b3f63fb56c0242830e':
Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.
Quddus Chong [Wed, 27 May 2015 20:44:23 +0000 (20:44 +0000)]
am
21992dc0: am
c33eba1a: am
8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467" into mnc-preview-docs
* commit '
21992dc0883b69d8022c65f98fc261503afb1142':
docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467
Alan Viverette [Wed, 27 May 2015 20:41:13 +0000 (20:41 +0000)]
am
33870f87: am
25fc117a: Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev
* commit '
33870f8765dd0533a8b9cc5dee9f72c7a24a6494':
Remove unused asset, prune large rarely-used Holo assets from preload
Alan Viverette [Wed, 27 May 2015 20:41:09 +0000 (20:41 +0000)]
am
fb5dae30: am
8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
* commit '
fb5dae3024b0a50b16a34a9e41f311dfaa1e192f':
Use DeviceDefault (dark) theme for PrintActivity
Chris Craik [Wed, 27 May 2015 20:41:04 +0000 (20:41 +0000)]
am
455152bc: am
1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev
* commit '
455152bce2f99afade6ae9658bcf83673152bde8':
Fix assert when dumping view at 0 alpha
Chris Craik [Wed, 27 May 2015 20:40:59 +0000 (20:40 +0000)]
am
b6483c5e: am
1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev
* commit '
b6483c5e736cf9a7f27bfdd019f063156617833d':
Fix GL texture binding for TextureViews
Alex Klyubin [Wed, 27 May 2015 20:40:53 +0000 (20:40 +0000)]
am
9e3743e8: am
06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
* commit '
9e3743e82c4d1457190de4982068d1c79d771cde':
Fix typo in Javadocs of KeyGenParameterSpec.
Andres Morales [Wed, 27 May 2015 20:40:48 +0000 (20:40 +0000)]
am
838cd2e4: am
5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev
* commit '
838cd2e467690492e89f5f53f60b3b4dc42c720b':
[LockSettings] migrate password attempt throttling to hardware
Julia Reynolds [Wed, 27 May 2015 20:40:43 +0000 (20:40 +0000)]
am
bd24ba18: am
77aa9afe: Merge "Fallback to priority activity if preferred activity not available." into mnc-dev
* commit '
bd24ba1819220547b17fa3570212b0054cbeb5c1':
Fallback to priority activity if preferred activity not available.
Alan Viverette [Wed, 27 May 2015 20:40:38 +0000 (20:40 +0000)]
am
d3972f39: am
d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev
* commit '
d3972f39b862252f3aee443f0fdc23e9ac4882cf':
Avoid strict mode violation during saveAttributeData
Tenghui Zhu [Wed, 27 May 2015 20:33:47 +0000 (20:33 +0000)]
Merge "AnimatedVectorDrawable Attr proof of concept" into mnc-dev
Rich Slogar [Wed, 27 May 2015 20:32:30 +0000 (20:32 +0000)]
am
986cc34c: am
4575cadc: docs: supportlib icon fix
* commit '
986cc34c64728d38145c0e981e1f0dd86a83b96b':
docs: supportlib icon fix
Luan Nguyen [Wed, 27 May 2015 20:32:24 +0000 (20:32 +0000)]
am
60877970: am
5904628c: docs: Remove Voice Camera sample.
* commit '
608779702f0fccd5fe06cbc000a9a4073bef97a5':
docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:32:20 +0000 (20:32 +0000)]
am
f42c6dfb: am
5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs
* commit '
f42c6dfbc3ccf0c11c33a4054725f95725764699':
docs: Remove 's' from Confirm Credential sample.
Joe Fernandez [Wed, 27 May 2015 20:32:15 +0000 (20:32 +0000)]
am
3d3414e4: am
47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
* commit '
3d3414e4dc63b4d1c494368becdc59696336bae6':
docs: M Preview - App links fix update
Luan Nguyen [Wed, 27 May 2015 20:32:09 +0000 (20:32 +0000)]
am
35c53c54: am
27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
* commit '
35c53c5453def1c97493b84298305e20688dccdc':
docs: Update instructions to download samples in Android Studio.
Alan Viverette [Wed, 27 May 2015 20:23:34 +0000 (20:23 +0000)]
am
25fc117a: Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev
* commit '
25fc117a358ecef3b97787c0847265d7f363ccae':
Remove unused asset, prune large rarely-used Holo assets from preload
Alan Viverette [Wed, 27 May 2015 20:23:30 +0000 (20:23 +0000)]
am
8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
* commit '
8141d6e1509a586e2954fbece04e64aaa02092a2':
Use DeviceDefault (dark) theme for PrintActivity
Chris Craik [Wed, 27 May 2015 20:23:23 +0000 (20:23 +0000)]
am
1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev
* commit '
1ec5e308a913cd0c54d58fd797274485664781c1':
Fix assert when dumping view at 0 alpha
Chris Craik [Wed, 27 May 2015 20:23:18 +0000 (20:23 +0000)]
am
1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev
* commit '
1e6d566c5f8500e3639a8f8ceebf0226c07efc13':
Fix GL texture binding for TextureViews
Alex Klyubin [Wed, 27 May 2015 20:23:14 +0000 (20:23 +0000)]
am
06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
* commit '
06c88b60efd12d3e81c7a9c53d8b995e23d04c5a':
Fix typo in Javadocs of KeyGenParameterSpec.
Andres Morales [Wed, 27 May 2015 20:23:05 +0000 (20:23 +0000)]
am
5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev
* commit '
5ccfe51d8b9ae4f73a3b0fdb553b807cf5691582':
[LockSettings] migrate password attempt throttling to hardware
Julia Reynolds [Wed, 27 May 2015 20:22:59 +0000 (20:22 +0000)]
am
77aa9afe: Merge "Fallback to priority activity if preferred activity not available." into mnc-dev
* commit '
77aa9afe0c67ca7285ed81664571f3d6f567eb9b':
Fallback to priority activity if preferred activity not available.
Alan Viverette [Wed, 27 May 2015 20:22:55 +0000 (20:22 +0000)]
am
d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev
* commit '
d0699fa5697ba43c64c142ee67b245e0a346acfe':
Avoid strict mode violation during saveAttributeData
Andrew Solovay [Wed, 27 May 2015 20:22:20 +0000 (20:22 +0000)]
am
30788ec8: am
f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
* commit '
30788ec81cec52eaf201f33eee9942016c18a8a9':
docs: Fixed targetSdkVersion in Auto Backup code snippets
Rich Slogar [Wed, 27 May 2015 20:22:15 +0000 (20:22 +0000)]
am
36462020: am
aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
* commit '
36462020d1d2cc6199115335bbf33c18829f64a8':
docs: support library 22.2 duplicate link removal
Andrew Solovay [Wed, 27 May 2015 20:22:10 +0000 (20:22 +0000)]
am
b709b0e8: am
b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
* commit '
b709b0e897c8feea38a211b6254c2dde33e319f6':
docs: Fixing typo on Auto Backup for Apps page.
David Friedman [Wed, 27 May 2015 20:22:04 +0000 (20:22 +0000)]
am
9b57a20a: am
be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
* commit '
9b57a20a555b32d5c1e8d11b7f580a7b8115dd79':
Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.
Quddus Chong [Wed, 27 May 2015 20:21:59 +0000 (20:21 +0000)]
am
c33eba1a: am
8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467" into mnc-preview-docs
* commit '
c33eba1aa53c9a591fd2c881c8008dbbef3ccf46':
docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467
Rich Slogar [Wed, 27 May 2015 20:21:30 +0000 (20:21 +0000)]
am
4575cadc: docs: supportlib icon fix
* commit '
4575cadc54ed2c574a6198b7247a774c5f8297cb':
docs: supportlib icon fix
Luan Nguyen [Wed, 27 May 2015 20:21:25 +0000 (20:21 +0000)]
am
5904628c: docs: Remove Voice Camera sample.
* commit '
5904628c89a1757be9fde4983d4e7f8cff28eb7c':
docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:21:20 +0000 (20:21 +0000)]
am
5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs
* commit '
5380cb6a8880fc6622bd669bc06321c20e1320d9':
docs: Remove 's' from Confirm Credential sample.
Joe Fernandez [Wed, 27 May 2015 20:21:15 +0000 (20:21 +0000)]
am
47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
* commit '
47badfebebec011fb6df48360c647c6ec15800ff':
docs: M Preview - App links fix update
Luan Nguyen [Wed, 27 May 2015 20:21:11 +0000 (20:21 +0000)]
am
27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
* commit '
27ce77acfda17b04d14e70d5f30c160f72ad8733':
docs: Update instructions to download samples in Android Studio.
Cedric Ho [Wed, 27 May 2015 20:20:18 +0000 (20:20 +0000)]
am
b343bfd9: am
2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
* commit '
b343bfd95a70b77b4d32dd777288b66ea5b024aa':
Add getCallingUid() to RecognitionService.Callback.
Rich Slogar [Wed, 27 May 2015 20:03:14 +0000 (13:03 -0700)]
docs: supportlib icon fix
Change-Id: I423271109e479a8bacc8edb44801dcb5c05ef634
Alan Viverette [Wed, 27 May 2015 19:59:11 +0000 (19:59 +0000)]
Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev
Alan Viverette [Wed, 27 May 2015 19:55:49 +0000 (12:55 -0700)]
Remove unused asset, prune large rarely-used Holo assets from preload
Bug:
21352447
Change-Id: I4ad6bc99edf5af0a665827702457925339204f97
Alan Viverette [Wed, 27 May 2015 19:26:25 +0000 (19:26 +0000)]
Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:43 +0000 (19:22 +0000)]
Merge "Fix assert when dumping view at 0 alpha" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:42 +0000 (19:22 +0000)]
Merge "Fix GL texture binding for TextureViews" into mnc-dev
Alan Viverette [Wed, 27 May 2015 19:17:26 +0000 (12:17 -0700)]
Use DeviceDefault (dark) theme for PrintActivity
Bug:
21433656
Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6
Luan Nguyen [Wed, 27 May 2015 18:58:52 +0000 (11:58 -0700)]
docs: Remove Voice Camera sample.
Change-Id: I65ac20c33be9820519c0eb0e931272a0ef9bb34f
Andrew Solovay [Wed, 27 May 2015 18:54:52 +0000 (18:54 +0000)]
am
f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
* commit '
f0560097eef030d3bf65132c974dbc2f6b1cb681':
docs: Fixed targetSdkVersion in Auto Backup code snippets
Rich Slogar [Wed, 27 May 2015 18:54:48 +0000 (18:54 +0000)]
am
aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
* commit '
aa3d35e677e027bf9a8a17c59b6507e588a1b9cb':
docs: support library 22.2 duplicate link removal
Andrew Solovay [Wed, 27 May 2015 18:54:42 +0000 (18:54 +0000)]
am
b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
* commit '
b7227c2bf9f1893c5d9778a8344b1bfe6394c4d3':
docs: Fixing typo on Auto Backup for Apps page.
David Friedman [Wed, 27 May 2015 18:54:37 +0000 (18:54 +0000)]
am
be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
* commit '
be4fc248b72e27dad6f677910566226c7dd9d670':
Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.
Quddus Chong [Wed, 27 May 2015 18:54:31 +0000 (18:54 +0000)]
am
8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467" into mnc-preview-docs
* commit '
8525b8a8b54e2f97839cb80eee79404ab196c2db':
docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467
Luan Nguyen [Wed, 27 May 2015 18:52:32 +0000 (18:52 +0000)]
Merge "docs: Remove 's' from Confirm Credential sample." into mnc-preview-docs
Luan Nguyen [Wed, 27 May 2015 18:51:14 +0000 (11:51 -0700)]
docs: Remove 's' from Confirm Credential sample.
Change-Id: I4b33fec58014c54594210e0f5f4e759393adc618
Joe Fernandez [Wed, 27 May 2015 18:51:07 +0000 (18:51 +0000)]
Merge "docs: M Preview - App links fix update" into mnc-preview-docs
Alex Klyubin [Wed, 27 May 2015 18:46:55 +0000 (18:46 +0000)]
Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
Andres Morales [Wed, 27 May 2015 18:37:21 +0000 (18:37 +0000)]
Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev
Joe Fernandez [Wed, 27 May 2015 18:28:36 +0000 (11:28 -0700)]
docs: M Preview - App links fix update
- final comments
- naming change to "App Links"
Change-Id: I2c8f105e0b75f95ca2e9d6bb86fd85d21dcd3326
Julia Reynolds [Wed, 27 May 2015 18:28:40 +0000 (18:28 +0000)]
Merge "Fallback to priority activity if preferred activity not available." into mnc-dev
Chris Craik [Wed, 27 May 2015 18:28:14 +0000 (11:28 -0700)]
Fix assert when dumping view at 0 alpha
bug:
21461177
Change-Id: Ib4aba7b9641254012471da44aa804813b9679423
Luan Nguyen [Wed, 27 May 2015 18:22:38 +0000 (18:22 +0000)]
Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
Luan Nguyen [Wed, 27 May 2015 15:51:32 +0000 (08:51 -0700)]
docs: Update instructions to download samples in Android Studio.
bug:
21425873
Change-Id: I0e5710c08f7fbe5f92ca16b366ea14a1b05d491a
Chris Craik [Wed, 27 May 2015 18:06:21 +0000 (11:06 -0700)]
Fix GL texture binding for TextureViews
bug:
21431334
Should be explicitly passing target through, to ensure
GL_EXTERNAL_OES textures are bound correctly.
Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b
John Reck [Wed, 27 May 2015 18:01:15 +0000 (18:01 +0000)]
am
89745e6f: am
302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev
* commit '
89745e6f451bfa2071de066e665f4a2bc75738bf':
Enable swapBuffersWithDamage by default
Cedric Ho [Wed, 27 May 2015 18:01:09 +0000 (18:01 +0000)]
am
2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
* commit '
2b919d4f69807528a11e38aee1a87507249d8319':
Add getCallingUid() to RecognitionService.Callback.
Alan Viverette [Wed, 27 May 2015 18:01:09 +0000 (18:01 +0000)]
am
1ed681dd: am
165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev
* commit '
1ed681dd2a3daa0cc109177703f2433ec354de58':
Add workaround for measuring stacked button bar layout
Alan Viverette [Wed, 27 May 2015 18:00:14 +0000 (18:00 +0000)]
Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev
Cedric Ho [Wed, 27 May 2015 17:46:40 +0000 (17:46 +0000)]
Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
John Reck [Wed, 27 May 2015 17:42:56 +0000 (17:42 +0000)]
am
302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev
* commit '
302abd22468367bcdeb1f85ea8014fe05ed95610':
Enable swapBuffersWithDamage by default
Alan Viverette [Wed, 27 May 2015 17:42:52 +0000 (17:42 +0000)]
am
165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev
* commit '
165229ba417fd77ccbb4feb3bc3c664d2cac7ce5':
Add workaround for measuring stacked button bar layout
Andrew Solovay [Wed, 27 May 2015 17:41:05 +0000 (17:41 +0000)]
Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
John Reck [Wed, 27 May 2015 17:39:17 +0000 (17:39 +0000)]
Merge "Enable swapBuffersWithDamage by default" into mnc-dev
Rich Slogar [Wed, 27 May 2015 17:38:48 +0000 (17:38 +0000)]
Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
Andrew Solovay [Wed, 27 May 2015 02:57:52 +0000 (19:57 -0700)]
docs: Fixed targetSdkVersion in Auto Backup code snippets
Changed targetSdkVerion from "android-MNC" to "MNC". Also--per
preview/setup-sdk.html -- changed the minSdkVersion to "MNC" in
both places (if people are building apps for the preview release,
the minimum SDK version has to be MNC to keep the app from getting
installed onto devices running production Android).
See first comment for doc stage location.
bug:
21443485
Change-Id: I4cc5f16d53cd795b2db156c99db7c46f14d0ce65
Alan Viverette [Wed, 27 May 2015 17:30:44 +0000 (17:30 +0000)]
Merge "Add workaround for measuring stacked button bar layout" into mnc-dev
John Reck [Wed, 27 May 2015 17:26:10 +0000 (10:26 -0700)]
Enable swapBuffersWithDamage by default
Bug:
20761426
Change-Id: I520e60ca4f182dea590bc86eebd522e1db7a018a
Alan Viverette [Wed, 27 May 2015 17:28:05 +0000 (10:28 -0700)]
Add workaround for measuring stacked button bar layout
Bug:
21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
Andrew Solovay [Wed, 27 May 2015 17:23:56 +0000 (17:23 +0000)]
Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
David Friedman [Wed, 27 May 2015 17:16:32 +0000 (17:16 +0000)]
Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
Geoff Mendal [Wed, 27 May 2015 17:09:49 +0000 (17:09 +0000)]
am
f509067d: (-s ours) am
07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f509067dfea7b8281683eda13af5485039ddc413':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 May 2015 16:54:23 +0000 (16:54 +0000)]
am
07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
07491cb93c66c0f4a1680dc07eca22dab5455c12':
Import translations. DO NOT MERGE
Cedric Ho [Wed, 27 May 2015 16:51:19 +0000 (09:51 -0700)]
Add getCallingUid() to RecognitionService.Callback.
Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07
Geoff Mendal [Wed, 27 May 2015 16:41:15 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Mike Colagrosso [Wed, 27 May 2015 16:38:15 +0000 (16:38 +0000)]
am
222a345c: am
6ffab1bd: am
f77b748c: am
31a48820: am
1c673f9a: am
6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
* commit '
222a345c9697f6c57a942187f355e04c5031dda9':
Android Training: Add missing word
OSDN Git Service
