OSDN Git Service
Marco Nelissen [Mon, 1 Jun 2015 16:16:01 +0000 (16:16 +0000)]
am
8a76cd6d: am
59984c79: am
2e2ac33e: Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
* commit '
8a76cd6d6d9b442aeef3a3251cb3a8d6c4408592':
Update ExifInterface.getDateTime to support subseconds
ztenghui [Mon, 1 Jun 2015 16:15:56 +0000 (16:15 +0000)]
am
f302eb00: am
856846f1: am
e9d8480f: Merge "Tweak the threshold for conic path quads computation." into mnc-dev
* commit '
f302eb00524e89971c181df3cac595b29575c2c5':
Tweak the threshold for conic path quads computation.
Joe Fernandez [Mon, 1 Jun 2015 16:15:50 +0000 (16:15 +0000)]
am
1b1930f1: am
eadb33b6: am
8c176dd2: am
927b8204: am
80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
* commit '
1b1930f184328fa6c61b906e518779f78d6f0fa7':
docs: Regen wearable docs with new redesign templates
Andrew Solovay [Mon, 1 Jun 2015 16:15:44 +0000 (16:15 +0000)]
am
6afc36d0: am
5075ee2a: am
9074831a: am
def1dde3: am
1521c51c: docs: Quick fixes to screenshot
* commit '
6afc36d0224659ef111f6f7f5a852b25bdee9480':
docs: Quick fixes to screenshot
Olawale Ogunwale [Mon, 1 Jun 2015 16:15:39 +0000 (16:15 +0000)]
am
a2576459: am
e1f58785: (-s ours) am
bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit '
a25764595c088c68cf8f90eabcf3066d874925f8':
Should reset mDismissKeyguard on keyguard secure change
Marco Nelissen [Mon, 1 Jun 2015 16:04:22 +0000 (16:04 +0000)]
am
59984c79: am
2e2ac33e: Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
* commit '
59984c795dd2c93a557f25e60fb124b28fd2da19':
Update ExifInterface.getDateTime to support subseconds
ztenghui [Mon, 1 Jun 2015 16:04:05 +0000 (16:04 +0000)]
am
856846f1: am
e9d8480f: Merge "Tweak the threshold for conic path quads computation." into mnc-dev
* commit '
856846f15a533828d33f1b515a71b059f1ee9a7e':
Tweak the threshold for conic path quads computation.
Joe Fernandez [Mon, 1 Jun 2015 16:04:00 +0000 (16:04 +0000)]
am
eadb33b6: am
8c176dd2: am
927b8204: am
80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
* commit '
eadb33b629aaa21ca888ffcf12b21d800038400a':
docs: Regen wearable docs with new redesign templates
Andrew Solovay [Mon, 1 Jun 2015 16:03:47 +0000 (16:03 +0000)]
am
5075ee2a: am
9074831a: am
def1dde3: am
1521c51c: docs: Quick fixes to screenshot
* commit '
5075ee2aa6df48d3827a09ec2671bc57c73e3eab':
docs: Quick fixes to screenshot
Olawale Ogunwale [Mon, 1 Jun 2015 16:02:38 +0000 (16:02 +0000)]
am
e1f58785: (-s ours) am
bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit '
e1f587859a2e41e309a93d2de604753bdbb14dca':
Should reset mDismissKeyguard on keyguard secure change
Olawale Ogunwale [Mon, 1 Jun 2015 15:48:14 +0000 (15:48 +0000)]
am
995846a4: am
d147203b: am
ad2be762: Merge "Fix null pointer dereference when security exception occurs"
* commit '
995846a4310ef4270177bf9d6c6673827b5625af':
Fix null pointer dereference when security exception occurs
Olawale Ogunwale [Mon, 1 Jun 2015 15:48:08 +0000 (15:48 +0000)]
am
185a3d7d: am
f9efac12: am
5ef53783: Merge "WindowManagerService not propagating X and Y steps"
* commit '
185a3d7d3566348a191a448d3aff1ec6c2b97033':
WindowManagerService not propagating X and Y steps
Chris Wren [Mon, 1 Jun 2015 15:48:02 +0000 (15:48 +0000)]
am
bb5ef426: am
8517a793: am
0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev
* commit '
bb5ef42654b5a1dd768ece4a002ba0bbb941e7c6':
add time-in-mode metrics for zen mode
Adrian Roos [Mon, 1 Jun 2015 15:47:56 +0000 (15:47 +0000)]
am
a3cd7dda: am
4adc3b00: am
e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev
* commit '
a3cd7dda9763c56f9ebdaa79700c8ed246a5ca75':
Hide KeyguardMessageArea if empty
destradaa [Mon, 1 Jun 2015 15:47:50 +0000 (15:47 +0000)]
am
36cb20bc: am
aff14c59: am
ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/
21516868
* commit '
36cb20bc547e2d762f8ee51398143b0ab4cc0b59':
Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/
21516868
Yohei Yukawa [Mon, 1 Jun 2015 15:47:43 +0000 (15:47 +0000)]
am
1d95daf3: am
4ad0161a: am
650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '
1d95daf37dd492ae3f7c1ea0a35114ae32dcaecf':
Revert "Rely on IMM#focusOut() to close input session."
Doris Liu [Mon, 1 Jun 2015 15:47:38 +0000 (15:47 +0000)]
am
0040c7d2: am
c2713141: am
f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit '
0040c7d2bab147d4ea88aa7d0299bd51420b799f':
Update doc to include how clipToPadding affects EdgeEffect
Svetoslav [Mon, 1 Jun 2015 15:47:32 +0000 (15:47 +0000)]
am
d5464b9d: am
80c2cc14: am
815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
* commit '
d5464b9d07f6d5cf39d8173d5a026ce457dc458f':
Use AtomicFile APIs correctly when reading.
Alex Klyubin [Mon, 1 Jun 2015 15:47:24 +0000 (15:47 +0000)]
am
c623d988: am
db57c48e: am
d377b067: Merge "Cleanup Binder token resetting." into mnc-dev
* commit '
c623d9887be68d9c647dd40dc55743bb61b791ab':
Cleanup Binder token resetting.
John Spurlock [Mon, 1 Jun 2015 15:47:19 +0000 (15:47 +0000)]
am
7eac7b5a: am
68a00c52: am
2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
* commit '
7eac7b5af10da68cb11737a3f7fcdc2012cda87f':
Zen: Dim status bar alarm icon when zen = total silence.
Jorim Jaggi [Mon, 1 Jun 2015 15:47:13 +0000 (15:47 +0000)]
am
79187252: am
36325016: am
2400197f: Enable Keyguard debug logging
* commit '
791872526f2461853cdab8744369bc6a3cc2ad06':
Enable Keyguard debug logging
Alex Klyubin [Mon, 1 Jun 2015 15:47:08 +0000 (15:47 +0000)]
am
c95fba73: am
1a3ab87e: am
614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
* commit '
c95fba73540c475b92b3e9ce977992cd565d1a04':
Refactor Android Keystore CipherSpi base class.
Quddus Chong [Mon, 1 Jun 2015 15:47:02 +0000 (15:47 +0000)]
am
61333026: am
d5796be5: am
c1862737: am
f253e7d5: am
c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
* commit '
613330265bc8be621c924f45ffdca76d3c745195':
docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
Tyler Gunn [Mon, 1 Jun 2015 15:46:54 +0000 (15:46 +0000)]
am
791eac86: am
19eadcab: am
2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev
* commit '
791eac86138e0f8d04c7c507e7410c40114308a1':
Un-@hide some missed video APIs.
John Spurlock [Mon, 1 Jun 2015 15:46:49 +0000 (15:46 +0000)]
am
57436577: am
f1b897e8: am
e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
* commit '
57436577e2771cd4ff81c88d93362325ecd3a8c7':
Zen: Add warning text if total silence will eat the next alarm.
Alex Klyubin [Mon, 1 Jun 2015 15:46:44 +0000 (15:46 +0000)]
am
3e83ea3f: am
97e7fec6: am
1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
* commit '
3e83ea3f117e3509bcd869141abf2fe0302d0264':
Add algorithm aliases for Android Keystore HMACs.
Andy Hung [Mon, 1 Jun 2015 15:46:38 +0000 (15:46 +0000)]
am
f3853332: am
af739a10: am
51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
* commit '
f3853332a4d59a5448cc95c22e33ccee66b83e53':
Clarify AudioFormat sample rate and encoding documentation
Jason Monk [Mon, 1 Jun 2015 15:46:32 +0000 (15:46 +0000)]
am
d232a172: am
3e1bdc61: am
2280218a: Merge "Don\'t use string that has been removed." into mnc-dev
* commit '
d232a172ee34964b74a2ca400a247f37cca0c7f9':
Don't use string that has been removed.
Glenn Kasten [Mon, 1 Jun 2015 15:46:26 +0000 (15:46 +0000)]
James Cook [Mon, 1 Jun 2015 15:46:20 +0000 (15:46 +0000)]
am
fcce03b6: am
3c668bac: am
63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '
fcce03b6085b3faaaa2c95a6c32343be07cce2a3':
assist: Fix reported colors/styles for TextView/Switch
Tony Mantler [Mon, 1 Jun 2015 15:46:14 +0000 (15:46 +0000)]
am
8e56a1a6: am
29ef4811: am
85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
* commit '
8e56a1a67d767d5c504232bbc697fe5de41acb7c':
Move ZoneGetter into SettingsLib
Geoff Mendal [Mon, 1 Jun 2015 15:46:08 +0000 (15:46 +0000)]
am
c38f2008: (-s ours) am
c5508f85: (-s ours) am
55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
c38f20080304c18bdb0bf90f942146ca53dff752':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 15:46:04 +0000 (15:46 +0000)]
am
777767cb: (-s ours) am
8474bf48: (-s ours) am
8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
777767cb928123684d4e30f5eb5bbaf3d560cca3':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 15:45:57 +0000 (15:45 +0000)]
am
ed2f33ce: (-s ours) am
6c15c153: (-s ours) am
99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
ed2f33ce76eac9b74b9b105bafbc328560b18d57':
Revert "Import translations. DO NOT MERGE"
John Spurlock [Mon, 1 Jun 2015 15:45:51 +0000 (15:45 +0000)]
am
a0962acf: am
8cf1276c: am
4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev
* commit '
a0962acfbe9d0d1d852e4b4aced18974a6ea6141':
Tuner: add battery pct preference.
Geoff Mendal [Mon, 1 Jun 2015 15:45:46 +0000 (15:45 +0000)]
am
e30f773c: (-s ours) am
060b2ce9: (-s ours) am
e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e30f773ca54de3616cd1eeb935c871b60268b3c7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:45:40 +0000 (15:45 +0000)]
am
b6dae108: (-s ours) am
76625fec: (-s ours) am
0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b6dae108b33381f4478781136b0dc395fde38136':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:45:35 +0000 (15:45 +0000)]
am
36fc6a88: (-s ours) am
57103ebf: (-s ours) am
df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
36fc6a88d266ae18151971d390d5e7c9b6d91f55':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:45:29 +0000 (15:45 +0000)]
am
39a58e87: (-s ours) am
408606f3: (-s ours) am
78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
39a58e878c58579ab22b855a50d33398dbf5a7ff':
Import translations. DO NOT MERGE
Xiyuan Xia [Mon, 1 Jun 2015 15:45:23 +0000 (15:45 +0000)]
am
bfcdb7b4: am
223826b3: am
e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
* commit '
bfcdb7b41bcff438243fbaa02580af7f5202cf11':
Avoid keyguard UI layout dimensions underflow
Geoff Mendal [Mon, 1 Jun 2015 15:45:17 +0000 (15:45 +0000)]
am
7b5e5d5a: (-s ours) am
7ec9264f: (-s ours) am
642c4fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
7b5e5d5ade3d43c691afc2af389608f84823e19e':
Import translations. DO NOT MERGE
Narayan Kamath [Mon, 1 Jun 2015 15:45:11 +0000 (15:45 +0000)]
am
0bc58c6b: am
2de63d7c: am
d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
* commit '
0bc58c6b5c72261b9821df70d38ed4bc708a7596':
Avoid inspecting packages twice to deduce ABIs for moves / installs.
John Spurlock [Mon, 1 Jun 2015 15:45:05 +0000 (15:45 +0000)]
am
f7043e28: am
015a95ff: am
6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '
f7043e284a8480df5cdbca26ff75354d2b243bb7':
Zen: Use account name instead of calendar id in event conditions.
Selim Cinek [Mon, 1 Jun 2015 15:44:58 +0000 (15:44 +0000)]
am
19eee4a4: am
4dbe7c0d: am
ff3bf4b1: Increased the falsing treashold for quick settings
* commit '
19eee4a498c84c73ea401d3d6cf95eb640f66ff0':
Increased the falsing treashold for quick settings
Dirk Dougherty [Mon, 1 Jun 2015 15:44:53 +0000 (15:44 +0000)]
am
9fc33d8d: am
4b9d724c: am
34cca12b: am
906a91b4: am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
9fc33d8d950971435fe61de6c68d20fab5004afe':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
David Friedman [Mon, 1 Jun 2015 15:44:48 +0000 (15:44 +0000)]
am
1be7fb90: am
bc0e7f28: am
95af201a: am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
1be7fb908aa45ffe93279a4e566c994ee8779aa2':
Docs: Corrects technical content of one sentence, and deletes another.
Guang Zhu [Mon, 1 Jun 2015 15:44:42 +0000 (15:44 +0000)]
am
74ecc15d: am
0ca15144: am
9bb76544: fix NPE in shutdown thread
* commit '
74ecc15db923fdc8c94ac156aa1b6c923173b50a':
fix NPE in shutdown thread
Andrew Solovay [Mon, 1 Jun 2015 15:44:37 +0000 (15:44 +0000)]
am
739b6941: am
74f4e4f1: am
832654a8: am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
739b6941f6a9297c45312b3a1eec4b099d3f6325':
docs: Quick spelling fix
Sungsoo Lim [Mon, 1 Jun 2015 15:44:30 +0000 (15:44 +0000)]
am
26eed049: am
f819ac38: am
6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
* commit '
26eed04988d57faff5e0d85a9faaa6c8c15a6002':
Send a message with data in MediaController.MessageHandler.post()
Yorke Lee [Mon, 1 Jun 2015 15:44:24 +0000 (15:44 +0000)]
am
ac8b0b02: am
923df3da: am
d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
* commit '
ac8b0b024acdb7e0b3003d63fecfb8bf0ffbb869':
Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Glenn Kasten [Mon, 1 Jun 2015 15:44:19 +0000 (15:44 +0000)]
am
66127840: am
a84e73a7: am
ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
* commit '
66127840c3faa1f832cf252647d6c5fff88bd02b':
Improve error handling for AudioTrack write with PTS
Raph Levien [Mon, 1 Jun 2015 15:44:14 +0000 (15:44 +0000)]
am
1091defa: am
023973ec: am
71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '
1091defa85b7e31f9b7c67735c19af33268b341d':
Use getRunAdvance to position cursor
Alan Viverette [Mon, 1 Jun 2015 15:44:09 +0000 (15:44 +0000)]
am
41eeeca2: am
4e419432: am
a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
* commit '
41eeeca272f5250c0a33ef65fb8ffb296324c115':
Synchronize Theme.Material and Theme.Material light attributes
Makoto Onuki [Mon, 1 Jun 2015 15:44:03 +0000 (15:44 +0000)]
am
7b8612d0: am
8c48834b: am
0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev
* commit '
7b8612d0eae188b5090f60fb4d080d6634182d0c':
CountryDetector no longer requires location permissions.
Yohei Yukawa [Mon, 1 Jun 2015 15:43:59 +0000 (15:43 +0000)]
am
47d691ba: am
92086e06: am
5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '
47d691baf79f863f9ad3091642c7f9944eed3b21':
Rely on IMM#focusOut() to close input session.
Brian Attwell [Mon, 1 Jun 2015 15:43:53 +0000 (15:43 +0000)]
am
d54cbba8: am
4ababd27: am
19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
* commit '
d54cbba80567110d103f93afdee16e582ef22751':
Rename "end" to "endExclusive" in addPhoneTtsSpan
Alan Viverette [Mon, 1 Jun 2015 15:43:48 +0000 (15:43 +0000)]
am
e440ac1a: am
9ddcef8e: am
3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
* commit '
e440ac1aa433a62f668039d5b0ed9e2734706bf0':
Postpone AnimatedVectorDrawable animator inflation until applyTheme()
Andres Morales [Mon, 1 Jun 2015 15:43:42 +0000 (15:43 +0000)]
am
0b8ddb47: am
8d61ab00: am
a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '
0b8ddb47924506ea349b327c233d50ee8508add5':
[partition checking] re-enable bootimage/bootloader, add recovery
Olawale Ogunwale [Mon, 1 Jun 2015 15:34:52 +0000 (15:34 +0000)]
am
bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit '
bf17375e5e6195122ee24295cf05f012822711ec':
Should reset mDismissKeyguard on keyguard secure change
Olawale Ogunwale [Mon, 1 Jun 2015 15:33:56 +0000 (15:33 +0000)]
am
d147203b: am
ad2be762: Merge "Fix null pointer dereference when security exception occurs"
* commit '
d147203bc43926caddf953732682fc384ab597cb':
Fix null pointer dereference when security exception occurs
Olawale Ogunwale [Mon, 1 Jun 2015 15:33:50 +0000 (15:33 +0000)]
am
f9efac12: am
5ef53783: Merge "WindowManagerService not propagating X and Y steps"
* commit '
f9efac1291d7ada7806215d0f63661d6864e9974':
WindowManagerService not propagating X and Y steps
Chris Wren [Mon, 1 Jun 2015 15:28:25 +0000 (15:28 +0000)]
am
8517a793: am
0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev
* commit '
8517a793386bfc087dae1e94f78784f5e614b230':
add time-in-mode metrics for zen mode
Adrian Roos [Mon, 1 Jun 2015 15:28:20 +0000 (15:28 +0000)]
am
4adc3b00: am
e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev
* commit '
4adc3b00915febd11e149ae0c4d4edcc02c00767':
Hide KeyguardMessageArea if empty
destradaa [Mon, 1 Jun 2015 15:28:11 +0000 (15:28 +0000)]
am
aff14c59: am
ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/
21516868
* commit '
aff14c59a04586981a75392740cea997412c8821':
Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/
21516868
Yohei Yukawa [Mon, 1 Jun 2015 15:28:01 +0000 (15:28 +0000)]
am
4ad0161a: am
650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '
4ad0161a45a872981199285a0c72d2e79de44ba5':
Revert "Rely on IMM#focusOut() to close input session."
Doris Liu [Mon, 1 Jun 2015 15:27:54 +0000 (15:27 +0000)]
am
c2713141: am
f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit '
c271314154efc468022b9464a8d18eadf07a7183':
Update doc to include how clipToPadding affects EdgeEffect
Svetoslav [Mon, 1 Jun 2015 15:27:48 +0000 (15:27 +0000)]
am
80c2cc14: am
815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
* commit '
80c2cc14e12c3f79bb617e12c0827dc0eb7e7374':
Use AtomicFile APIs correctly when reading.
Alex Klyubin [Mon, 1 Jun 2015 15:27:42 +0000 (15:27 +0000)]
am
db57c48e: am
d377b067: Merge "Cleanup Binder token resetting." into mnc-dev
* commit '
db57c48e1c34d26823bc25e2da00e1056324efb4':
Cleanup Binder token resetting.
John Spurlock [Mon, 1 Jun 2015 15:27:37 +0000 (15:27 +0000)]
am
68a00c52: am
2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
* commit '
68a00c524b38809efbc32f8c22597522b637d67c':
Zen: Dim status bar alarm icon when zen = total silence.
Jorim Jaggi [Mon, 1 Jun 2015 15:27:31 +0000 (15:27 +0000)]
am
36325016: am
2400197f: Enable Keyguard debug logging
* commit '
36325016cafcb60669455be48247327d0197dff3':
Enable Keyguard debug logging
Alex Klyubin [Mon, 1 Jun 2015 15:26:52 +0000 (15:26 +0000)]
am
1a3ab87e: am
614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
* commit '
1a3ab87e93d26e659067298e250fe5e8cfc2e1b8':
Refactor Android Keystore CipherSpi base class.
Quddus Chong [Mon, 1 Jun 2015 15:26:46 +0000 (15:26 +0000)]
am
d5796be5: am
c1862737: am
f253e7d5: am
c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
* commit '
d5796be5e074345d073101cee2a1a2dcf825eea0':
docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
Tyler Gunn [Mon, 1 Jun 2015 15:26:39 +0000 (15:26 +0000)]
am
19eadcab: am
2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev
* commit '
19eadcaba885872491269399a1b2110c90b43ca8':
Un-@hide some missed video APIs.
John Spurlock [Mon, 1 Jun 2015 15:26:31 +0000 (15:26 +0000)]
am
f1b897e8: am
e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
* commit '
f1b897e8b5793430a1c28e66df7e4d346cd9a9a4':
Zen: Add warning text if total silence will eat the next alarm.
Alex Klyubin [Mon, 1 Jun 2015 15:26:25 +0000 (15:26 +0000)]
am
97e7fec6: am
1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
* commit '
97e7fec63ca3c72516e478b158e9673bdfc0118f':
Add algorithm aliases for Android Keystore HMACs.
Andy Hung [Mon, 1 Jun 2015 15:26:19 +0000 (15:26 +0000)]
am
af739a10: am
51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
* commit '
af739a10cf15c00467b90aaccc4907ce460e64de':
Clarify AudioFormat sample rate and encoding documentation
Jason Monk [Mon, 1 Jun 2015 15:26:12 +0000 (15:26 +0000)]
am
3e1bdc61: am
2280218a: Merge "Don\'t use string that has been removed." into mnc-dev
* commit '
3e1bdc61d85b9cc135cd52c0f05c0665d93621d5':
Don't use string that has been removed.
Glenn Kasten [Mon, 1 Jun 2015 15:26:06 +0000 (15:26 +0000)]
James Cook [Mon, 1 Jun 2015 15:26:00 +0000 (15:26 +0000)]
am
3c668bac: am
63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '
3c668bac5a670999719e2a5c9d8a719b5422ea38':
assist: Fix reported colors/styles for TextView/Switch
Tony Mantler [Mon, 1 Jun 2015 15:25:54 +0000 (15:25 +0000)]
am
29ef4811: am
85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
* commit '
29ef481165b2362c1fc91219b09f8a1f4b24e246':
Move ZoneGetter into SettingsLib
Geoff Mendal [Mon, 1 Jun 2015 15:25:47 +0000 (15:25 +0000)]
am
c5508f85: (-s ours) am
55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
c5508f8560b48a195f5b19dab98b0bc1bb85928b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 15:25:42 +0000 (15:25 +0000)]
am
8474bf48: (-s ours) am
8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
8474bf48aa37487270e335441005cea19515cf13':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 15:25:36 +0000 (15:25 +0000)]
am
6c15c153: (-s ours) am
99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
6c15c153fa831264f1134b703107acf40e206728':
Revert "Import translations. DO NOT MERGE"
John Spurlock [Mon, 1 Jun 2015 15:25:31 +0000 (15:25 +0000)]
am
8cf1276c: am
4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev
* commit '
8cf1276c8e08abcfe744309d3ce78f3e7b37ed31':
Tuner: add battery pct preference.
Geoff Mendal [Mon, 1 Jun 2015 15:25:25 +0000 (15:25 +0000)]
am
060b2ce9: (-s ours) am
e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
060b2ce9eaf77155024676f419ca37aa6c5ab895':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:25:20 +0000 (15:25 +0000)]
am
76625fec: (-s ours) am
0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
76625fec224a0fffa0664060f72d6cc1a7e9ba49':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:25:15 +0000 (15:25 +0000)]
am
57103ebf: (-s ours) am
df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
57103ebfa6188b2c421ba860d7063b62ca935af5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:25:10 +0000 (15:25 +0000)]
am
408606f3: (-s ours) am
78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
408606f31eb126bad9a8c1da28026ffe9c4943f4':
Import translations. DO NOT MERGE
Xiyuan Xia [Mon, 1 Jun 2015 15:25:02 +0000 (15:25 +0000)]
am
223826b3: am
e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
* commit '
223826b3cd1c7dc00706efc137b8a4dcaf7595fa':
Avoid keyguard UI layout dimensions underflow
Geoff Mendal [Mon, 1 Jun 2015 15:24:55 +0000 (15:24 +0000)]
am
7ec9264f: (-s ours) am
642c4fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
7ec9264f40087f48dcab821c65a93f8628dd0e93':
Import translations. DO NOT MERGE
Narayan Kamath [Mon, 1 Jun 2015 15:24:49 +0000 (15:24 +0000)]
am
2de63d7c: am
d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
* commit '
2de63d7cc1398fe699cc2a16b47647674e4efb64':
Avoid inspecting packages twice to deduce ABIs for moves / installs.
John Spurlock [Mon, 1 Jun 2015 15:24:42 +0000 (15:24 +0000)]
am
015a95ff: am
6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '
015a95ff35e5e9de959c10d082fbe2e10c58885c':
Zen: Use account name instead of calendar id in event conditions.
Selim Cinek [Mon, 1 Jun 2015 15:24:32 +0000 (15:24 +0000)]
am
4dbe7c0d: am
ff3bf4b1: Increased the falsing treashold for quick settings
* commit '
4dbe7c0d16944ba4b8df4216f730acfc06818eca':
Increased the falsing treashold for quick settings
Dirk Dougherty [Mon, 1 Jun 2015 15:24:23 +0000 (15:24 +0000)]
am
4b9d724c: am
34cca12b: am
906a91b4: am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
4b9d724cd666bdad3703f383be8c024f4a6016a1':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
David Friedman [Mon, 1 Jun 2015 15:24:15 +0000 (15:24 +0000)]
am
bc0e7f28: am
95af201a: am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
bc0e7f287599e90a44ab249ba2fc0673ddfaf609':
Docs: Corrects technical content of one sentence, and deletes another.
Guang Zhu [Mon, 1 Jun 2015 15:24:03 +0000 (15:24 +0000)]
am
0ca15144: am
9bb76544: fix NPE in shutdown thread
* commit '
0ca15144e375e7439a64fabcbb53d6813135cfc4':
fix NPE in shutdown thread
Andrew Solovay [Mon, 1 Jun 2015 15:23:55 +0000 (15:23 +0000)]
am
74f4e4f1: am
832654a8: am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
74f4e4f1b8016a586d6a0b3ca6ebe06840c21573':
docs: Quick spelling fix
Sungsoo Lim [Mon, 1 Jun 2015 15:23:46 +0000 (15:23 +0000)]
am
f819ac38: am
6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
* commit '
f819ac38a9647a8d7d00bca83f176e32a415517e':
Send a message with data in MediaController.MessageHandler.post()
Yorke Lee [Mon, 1 Jun 2015 15:23:37 +0000 (15:23 +0000)]
am
923df3da: am
d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
* commit '
923df3da935b006b983ea1837538f6baecf26b86':
Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Glenn Kasten [Mon, 1 Jun 2015 15:23:23 +0000 (15:23 +0000)]
am
a84e73a7: am
ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
* commit '
a84e73a7bc99e4ef5c50125400d319a4124b4296':
Improve error handling for AudioTrack write with PTS