OSDN Git Service
Christopher Tate [Wed, 27 May 2015 22:48:02 +0000 (22:48 +0000)]
am
4fd986ae: am
fed19efc: Merge "Don\'t erase backup metadata when an app is uninstalled" into mnc-dev
* commit '
4fd986aeabc73282d60429b8aed5f1a69f0ac15c':
Don't erase backup metadata when an app is uninstalled
Christopher Tate [Wed, 27 May 2015 22:31:17 +0000 (22:31 +0000)]
am
fed19efc: Merge "Don\'t erase backup metadata when an app is uninstalled" into mnc-dev
* commit '
fed19efcdc996fbc29a395833cf8ba356bdb65f4':
Don't erase backup metadata when an app is uninstalled
Christopher Tate [Wed, 27 May 2015 22:17:40 +0000 (22:17 +0000)]
Merge "Don't erase backup metadata when an app is uninstalled" into mnc-dev
Svetoslav [Wed, 27 May 2015 22:13:43 +0000 (22:13 +0000)]
am
713f4c32: am
b2849d9a: Merge "Allow priv apps to get local mac address" into mnc-dev
* commit '
713f4c3271bfb729e48107335e2ba1de8bc98065':
Allow priv apps to get local mac address
Christopher Tate [Tue, 26 May 2015 19:57:56 +0000 (12:57 -0700)]
Don't erase backup metadata when an app is uninstalled
We still retain the data in the backup, in order to support the flow
in which a user has the app and its data is stored; then the app
is uninstalled; then later the app is reinstalled. We depend on
having correct metadata for the data in the datastore in order to
evaluate its validity for restore-at-install, so we mustn't
forget that metadata just because the app is not currently
installed.
We also now permit the sentinel pseudopackage name "@pm@" as an
argument to dataChanged(), indicating specifically that the metadata
should be scheduled for backup without having to be piggybacked on
another app's requested backup pass. That lets us now make sure to
schedule a backup pass for metadata-update in response to app
install activity.
Finally, fix a "min instead of max" bug in full backup scheduling
that was causing the OS to ignore the transport's inter-package
quiet time requirement when multiple packages were overdue for
backup.
Bug
21471973
Change-Id: I1dbc260edb91b8deadd2744e273dfa9578b9ef2a
Svetoslav [Wed, 27 May 2015 21:57:23 +0000 (21:57 +0000)]
am
b2849d9a: Merge "Allow priv apps to get local mac address" into mnc-dev
* commit '
b2849d9a20ac080c1b29a3b54a1d636080faccc3':
Allow priv apps to get local mac address
Alan Viverette [Wed, 27 May 2015 21:49:37 +0000 (21:49 +0000)]
am
36fe17ac: am
60bf94e3: Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev
* commit '
36fe17acc4857d7e5b4b7c456c4589a087a9116f':
Move ApplicationInfo hardware acceleration to public flags
Winson Chung [Wed, 27 May 2015 21:49:32 +0000 (21:49 +0000)]
am
2698d678: am
f8965523: Merge "Adding NPE check when the system has no tasks." into mnc-dev
* commit '
2698d678aec0f4704e835a56bef32bdf1dbd9c7d':
Adding NPE check when the system has no tasks.
Winson Chung [Wed, 27 May 2015 21:49:27 +0000 (21:49 +0000)]
am
4cc4fe87: am
e3230ae2: Merge "Fixing issue with screenshot icon being stretched." into mnc-dev
* commit '
4cc4fe873e5d6e9b222b64688b0bdc41a530b798':
Fixing issue with screenshot icon being stretched.
Ben Kwa [Wed, 27 May 2015 21:49:22 +0000 (21:49 +0000)]
am
c016b3ba: am
7a3b2012: Merge "Ensure that the copy notification is always cancelable." into mnc-dev
* commit '
c016b3ba7df9a4c85eac39e1cc353f1857d1a4a4':
Ensure that the copy notification is always cancelable.
Chong Zhang [Wed, 27 May 2015 21:49:16 +0000 (21:49 +0000)]
am
2b5505ca: am
ebdfefa4: Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev
* commit '
2b5505ca2425b1fc92cdc4b1157ddf0bec97030a':
MediaCodec: unhide mime type for EAC3
Svetoslav [Wed, 27 May 2015 21:41:29 +0000 (21:41 +0000)]
Merge "Allow priv apps to get local mac address" into mnc-dev
Svetoslav [Wed, 27 May 2015 21:39:21 +0000 (14:39 -0700)]
Allow priv apps to get local mac address
Change-Id: I550847cedd5a407c9424778e483b525d4b97e46d
Alan Viverette [Wed, 27 May 2015 21:34:24 +0000 (21:34 +0000)]
am
60bf94e3: Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev
* commit '
60bf94e3bef8da0adb4f42043770cef7a608d07d':
Move ApplicationInfo hardware acceleration to public flags
Winson Chung [Wed, 27 May 2015 21:34:20 +0000 (21:34 +0000)]
am
f8965523: Merge "Adding NPE check when the system has no tasks." into mnc-dev
* commit '
f89655239836f0aaca76044a51e8569ed91c660c':
Adding NPE check when the system has no tasks.
Winson Chung [Wed, 27 May 2015 21:34:16 +0000 (21:34 +0000)]
am
e3230ae2: Merge "Fixing issue with screenshot icon being stretched." into mnc-dev
* commit '
e3230ae223165948434370fd28e1e7a517ae6272':
Fixing issue with screenshot icon being stretched.
Ben Kwa [Wed, 27 May 2015 21:34:10 +0000 (21:34 +0000)]
am
7a3b2012: Merge "Ensure that the copy notification is always cancelable." into mnc-dev
* commit '
7a3b2012ea4d079a50edb8aa101a353830219d29':
Ensure that the copy notification is always cancelable.
Chong Zhang [Wed, 27 May 2015 21:34:04 +0000 (21:34 +0000)]
am
ebdfefa4: Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev
* commit '
ebdfefa496163fd32373699956a5492eca8990ff':
MediaCodec: unhide mime type for EAC3
Alan Viverette [Wed, 27 May 2015 21:30:05 +0000 (21:30 +0000)]
Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev
Alan Viverette [Wed, 27 May 2015 21:29:20 +0000 (14:29 -0700)]
Move ApplicationInfo hardware acceleration to public flags
Bug:
21342038
Change-Id: I5af826f3f2921eef24725c909304243c67f3da78
Winson Chung [Wed, 27 May 2015 21:27:20 +0000 (21:27 +0000)]
Merge "Adding NPE check when the system has no tasks." into mnc-dev
Winson Chung [Wed, 27 May 2015 21:26:47 +0000 (21:26 +0000)]
Merge "Fixing issue with screenshot icon being stretched." into mnc-dev
Winson Chung [Wed, 27 May 2015 19:41:29 +0000 (12:41 -0700)]
Fixing issue with screenshot icon being stretched.
Bug:
17491725
Change-Id: Iea36ed204dc9431fe1d80be5224a1fcbf6ff1c40
Chris Wren [Wed, 27 May 2015 21:24:32 +0000 (21:24 +0000)]
am
8e361bea: am
bcec2b0c: Merge "add event timers to all notification logs." into mnc-dev
* commit '
8e361bea4c2b105cffeed2fa0fb65ebf88ae8dc0':
add event timers to all notification logs.
Leon Scroggins III [Wed, 27 May 2015 21:24:28 +0000 (21:24 +0000)]
am
6daf3fee: am
610624ab: am
e15fa565: (-s ours) am
650f688c: am
6bf7bfb5: (-s ours) am
4b2d2add: am
958a7c1c: am
3d3e3bb4: am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
6daf3feef68a25b9f9bd1edc15f317c9ebdb1785':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 21:24:23 +0000 (21:24 +0000)]
am
f4329d92: am
97e854bc: am
ffe36bfb: (-s ours) am
1b4eed56: am
557ee34d: (-s ours) am
2adefefa: am
b6e3f930: am
2bbcc253: am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
f4329d9246523aae742e20754121ae1ee58f0075':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Ben Kwa [Wed, 27 May 2015 21:18:23 +0000 (21:18 +0000)]
Merge "Ensure that the copy notification is always cancelable." into mnc-dev
Chong Zhang [Wed, 27 May 2015 21:17:11 +0000 (21:17 +0000)]
Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev
Chris Wren [Wed, 27 May 2015 21:08:01 +0000 (21:08 +0000)]
am
bcec2b0c: Merge "add event timers to all notification logs." into mnc-dev
* commit '
bcec2b0cebd873f8b80c11c8653326fc638af860':
add event timers to all notification logs.
Leon Scroggins III [Wed, 27 May 2015 21:07:56 +0000 (21:07 +0000)]
am
610624ab: am
e15fa565: (-s ours) am
650f688c: am
6bf7bfb5: (-s ours) am
4b2d2add: am
958a7c1c: am
3d3e3bb4: am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
610624abf36eba4c106f5bdc565180eb9e3c05b5':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 21:07:53 +0000 (21:07 +0000)]
am
97e854bc: am
ffe36bfb: (-s ours) am
1b4eed56: am
557ee34d: (-s ours) am
2adefefa: am
b6e3f930: am
2bbcc253: am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
97e854bc6c52390bc093dd4a456364dccf3e7eb1':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Chong Zhang [Wed, 27 May 2015 21:07:29 +0000 (14:07 -0700)]
MediaCodec: unhide mime type for EAC3
bug:
18723951
Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591
Chris Wren [Wed, 27 May 2015 21:05:07 +0000 (21:05 +0000)]
Merge "add event timers to all notification logs." into mnc-dev
Alan Viverette [Wed, 27 May 2015 21:01:27 +0000 (21:01 +0000)]
am
ea872139: am
a2f47be6: Merge "API Review: Drawable" into mnc-dev
* commit '
ea872139615f997e22b98a1aeaaf51420baad731':
API Review: Drawable
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
Leon Scroggins III [Wed, 27 May 2015 20:51:15 +0000 (20:51 +0000)]
am
e15fa565: (-s ours) am
650f688c: am
6bf7bfb5: (-s ours) am
4b2d2add: am
958a7c1c: am
3d3e3bb4: am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
e15fa5654a902b79fa1ef5075f147e60ad90ae31':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 20:51:11 +0000 (20:51 +0000)]
am
ffe36bfb: (-s ours) am
1b4eed56: am
557ee34d: (-s ours) am
2adefefa: am
b6e3f930: am
2bbcc253: am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
ffe36bfbec4fc5fca89dca713c385c0fa6ee75c0':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Alan Viverette [Wed, 27 May 2015 20:45:13 +0000 (20:45 +0000)]
am
a2f47be6: Merge "API Review: Drawable" into mnc-dev
* commit '
a2f47be64b9a1af0ae621db0168366e457b31a3e':
API Review: Drawable
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
Alan Viverette [Wed, 27 May 2015 20:33:53 +0000 (20:33 +0000)]
Merge "API Review: Drawable" into mnc-dev
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.
Leon Scroggins III [Wed, 27 May 2015 20:31:41 +0000 (20:31 +0000)]
am
650f688c: am
6bf7bfb5: (-s ours) am
4b2d2add: am
958a7c1c: am
3d3e3bb4: am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
650f688c17f1439ac0e555668e4c454c3a3d273a':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 20:31:37 +0000 (20:31 +0000)]
am
1b4eed56: am
557ee34d: (-s ours) am
2adefefa: am
b6e3f930: am
2bbcc253: am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
1b4eed5659a4ac6e4a9f276c7f63da7dda4fa3b7':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Alan Viverette [Wed, 27 May 2015 20:26:41 +0000 (13:26 -0700)]
API Review: Drawable
Renames boolean getters to isZzz(), callback from onChange to onChanged.
Bug:
21342040
Change-Id: I9700d645453354b608fd97a832359211d828b52f
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.
Leon Scroggins III [Wed, 27 May 2015 20:20:42 +0000 (20:20 +0000)]
am
6bf7bfb5: (-s ours) am
4b2d2add: am
958a7c1c: am
3d3e3bb4: am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
6bf7bfb5d2b0693b8b1c4126eea7624e5cfb29f7':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 20:20:38 +0000 (20:20 +0000)]
am
557ee34d: (-s ours) am
2adefefa: am
b6e3f930: am
2bbcc253: am
b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '
557ee34d97c435e19034235aff258aea093efc3f':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
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