OSDN Git Service
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
Raph Levien [Mon, 1 Jun 2015 15:23:16 +0000 (15:23 +0000)]
am
023973ec: am
71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '
023973ecc66c62f2b83d9154097bb370966ed96d':
Use getRunAdvance to position cursor
Alan Viverette [Mon, 1 Jun 2015 15:23:09 +0000 (15:23 +0000)]
am
4e419432: am
a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
* commit '
4e419432e1717de6154ea5c8177c519fe449b8f0':
Synchronize Theme.Material and Theme.Material light attributes
Makoto Onuki [Mon, 1 Jun 2015 15:23:03 +0000 (15:23 +0000)]
am
8c48834b: am
0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev
* commit '
8c48834b112cf10d43bacd668aadf6f3cf4a9ad1':
CountryDetector no longer requires location permissions.
Yohei Yukawa [Mon, 1 Jun 2015 15:22:58 +0000 (15:22 +0000)]
am
92086e06: am
5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '
92086e06ad3167ebfadbc746d32e86c335878a8f':
Rely on IMM#focusOut() to close input session.
Brian Attwell [Mon, 1 Jun 2015 15:22:52 +0000 (15:22 +0000)]
am
4ababd27: am
19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
* commit '
4ababd27401db430afb2f30d29efce972f8b1ccb':
Rename "end" to "endExclusive" in addPhoneTtsSpan
Alan Viverette [Mon, 1 Jun 2015 15:22:47 +0000 (15:22 +0000)]
am
9ddcef8e: am
3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
* commit '
9ddcef8eec56bd161d8f8e91c854b740232f6a64':
Postpone AnimatedVectorDrawable animator inflation until applyTheme()
Andres Morales [Mon, 1 Jun 2015 15:22:42 +0000 (15:22 +0000)]
am
8d61ab00: am
a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '
8d61ab0003e26952349a959a4a38d3ebdea664d0':
[partition checking] re-enable bootimage/bootloader, add recovery
Neil Fuller [Mon, 1 Jun 2015 12:26:01 +0000 (12:26 +0000)]
am
59b24040: am
e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit '
59b240404f19f3450e710e07a90d4e8d35fabcaf':
Fix javadocs based on recent case consistency change
Neil Fuller [Mon, 1 Jun 2015 12:14:47 +0000 (12:14 +0000)]
am
e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit '
e761938c39c1cafa80d0c474e107041316a49cbd':
Fix javadocs based on recent case consistency change
Neil Fuller [Mon, 1 Jun 2015 12:01:44 +0000 (12:01 +0000)]
Merge "Fix javadocs based on recent case consistency change"
Chad Brubaker [Fri, 29 May 2015 21:44:34 +0000 (21:44 +0000)]
am
0189c6ef: am
dd783301: Merge "Add optional additional entropy to finish"
* commit '
0189c6efed4f36db0661d827d998a49bc34ece12':
Add optional additional entropy to finish
Chad Brubaker [Fri, 29 May 2015 21:31:52 +0000 (21:31 +0000)]
am
dd783301: Merge "Add optional additional entropy to finish"
* commit '
dd78330140ad0e02fc693fc1f5bf041adcf64a1f':
Add optional additional entropy to finish
Chad Brubaker [Fri, 29 May 2015 21:17:54 +0000 (21:17 +0000)]
Merge "Add optional additional entropy to finish"
Jorim Jaggi [Fri, 29 May 2015 20:51:39 +0000 (20:51 +0000)]
am
2400197f: Enable Keyguard debug logging
* commit '
2400197f10ff2ca8d393eac47a65a09dc0cea3e9':
Enable Keyguard debug logging
Jorim Jaggi [Fri, 29 May 2015 19:32:48 +0000 (12:32 -0700)]
Enable Keyguard debug logging
Bug:
21320918
Change-Id: I2529bfb7cdaae6042bbc9e51340c7571a5a63ad0
Chad Brubaker [Fri, 29 May 2015 19:32:51 +0000 (12:32 -0700)]
Add optional additional entropy to finish
If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.
Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
Alex Klyubin [Fri, 29 May 2015 19:32:10 +0000 (19:32 +0000)]
am
614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
* commit '
614b39f3de7747e9e1cd00d8985ec6fa9b356217':
Refactor Android Keystore CipherSpi base class.
Quddus Chong [Fri, 29 May 2015 19:22:34 +0000 (19:22 +0000)]
am
c1862737: am
f253e7d5: am
c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
* commit '
c1862737f8fd5c1b366d488e22c020e565f543c3':
docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
Tyler Gunn [Fri, 29 May 2015 19:22:24 +0000 (19:22 +0000)]
am
2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev
* commit '
2b26e8dcd130a371ef7ed170316766d0fbcd3212':
Un-@hide some missed video APIs.
John Spurlock [Fri, 29 May 2015 19:22:17 +0000 (19:22 +0000)]
am
e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
* commit '
e648c5f1cb41f72a3404a9a7d2656e764c52f8e1':
Zen: Add warning text if total silence will eat the next alarm.
Alex Klyubin [Fri, 29 May 2015 19:22:11 +0000 (19:22 +0000)]
am
1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
* commit '
1a23c31752f1295c708cf749a7828dc42e4e9d9e':
Add algorithm aliases for Android Keystore HMACs.
Andy Hung [Fri, 29 May 2015 19:22:04 +0000 (19:22 +0000)]
am
51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
* commit '
51c1e3bd149d2e10e68ad72fd7d25ef826a6075c':
Clarify AudioFormat sample rate and encoding documentation
Jason Monk [Fri, 29 May 2015 19:21:58 +0000 (19:21 +0000)]
am
2280218a: Merge "Don\'t use string that has been removed." into mnc-dev
* commit '
2280218a93cbda885a7530f3b30c3d8d4b3a1ff6':
Don't use string that has been removed.
Glenn Kasten [Fri, 29 May 2015 19:21:44 +0000 (19:21 +0000)]
James Cook [Fri, 29 May 2015 19:21:37 +0000 (19:21 +0000)]
am
63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '
63b6320af4302c0d190bbfaba739049b59c2418b':
assist: Fix reported colors/styles for TextView/Switch
Tony Mantler [Fri, 29 May 2015 19:20:57 +0000 (19:20 +0000)]
am
85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
* commit '
85b039f3488d15a926993b9df2a550a01a1938a4':
Move ZoneGetter into SettingsLib
Geoff Mendal [Fri, 29 May 2015 19:20:42 +0000 (19:20 +0000)]
am
55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
55b4b2d5a82ef7999a32b8163340a15085b2df38':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 19:20:34 +0000 (19:20 +0000)]
am
8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
8320436ce559ba6b80e32bf24d5917fe7ee6c241':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 19:20:23 +0000 (19:20 +0000)]
am
99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
9917768736f7d8581ee094267d2a4e5ca2b31cbf':
Revert "Import translations. DO NOT MERGE"
John Spurlock [Fri, 29 May 2015 19:20:17 +0000 (19:20 +0000)]
am
4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev
* commit '
4402f4bb12cc70eef3bae20631a4a9fe210c7c80':
Tuner: add battery pct preference.
Geoff Mendal [Fri, 29 May 2015 19:19:57 +0000 (19:19 +0000)]
am
e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e796112904a737e61f2ecce3f0fd42d2cba25436':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 19:19:52 +0000 (19:19 +0000)]
am
0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
0bdf1aab31d110b9e9de819e34e922f13442bf53':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 19:19:47 +0000 (19:19 +0000)]
am
df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
df55ecbf9ccb18793338aa7eb04f0faec45889cd':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 19:19:41 +0000 (19:19 +0000)]
am
78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
78a247da5f21415657a9ab6f20d4d8449a13f734':
Import translations. DO NOT MERGE
Xiyuan Xia [Fri, 29 May 2015 19:19:27 +0000 (19:19 +0000)]
am
e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
* commit '
e103029dbc457596661ae4066aabcb2a35f07dfd':
Avoid keyguard UI layout dimensions underflow
Geoff Mendal [Fri, 29 May 2015 19:19:20 +0000 (19:19 +0000)]
am
642c4fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
642c4fc527da40cf4697d3630bdebdfc1044ab82':
Import translations. DO NOT MERGE
Narayan Kamath [Fri, 29 May 2015 19:18:51 +0000 (19:18 +0000)]
am
d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
* commit '
d644c5638180d5d4218f34e1afb9e7782fc52e49':
Avoid inspecting packages twice to deduce ABIs for moves / installs.
John Spurlock [Fri, 29 May 2015 19:18:45 +0000 (19:18 +0000)]
am
6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '
6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
Zen: Use account name instead of calendar id in event conditions.
Selim Cinek [Fri, 29 May 2015 19:18:36 +0000 (19:18 +0000)]
am
ff3bf4b1: Increased the falsing treashold for quick settings
* commit '
ff3bf4b12f87d9aa552f517989f2b0dda4e43cc5':
Increased the falsing treashold for quick settings
Dirk Dougherty [Fri, 29 May 2015 19:18:31 +0000 (19:18 +0000)]
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 '
34cca12bbda96ea8aad86b0455eb61e4674a4616':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
David Friedman [Fri, 29 May 2015 19:18:26 +0000 (19:18 +0000)]
am
95af201a: am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
95af201aead0ce7dc5326220dd3ee8619a237ae6':
Docs: Corrects technical content of one sentence, and deletes another.
Guang Zhu [Fri, 29 May 2015 19:18:19 +0000 (19:18 +0000)]
am
9bb76544: fix NPE in shutdown thread
* commit '
9bb765448df43d41e0a3edb7de1d1641c9251c35':
fix NPE in shutdown thread
Andrew Solovay [Fri, 29 May 2015 19:18:09 +0000 (19:18 +0000)]
am
832654a8: am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
832654a8574b4371b5dc69216dd0b8377368fb5c':
docs: Quick spelling fix
Sungsoo Lim [Fri, 29 May 2015 19:18:01 +0000 (19:18 +0000)]
am
6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
* commit '
6dddc7d1a9ed7f94e37dd6127664e02e25ceb6c8':
Send a message with data in MediaController.MessageHandler.post()
Alex Klyubin [Fri, 29 May 2015 19:15:17 +0000 (19:15 +0000)]
Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
Quddus Chong [Fri, 29 May 2015 18:55:02 +0000 (18:55 +0000)]
am
f253e7d5: am
c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
* commit '
f253e7d547f22bb02ef943bd80f598ca30302bda':
docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
Quddus Chong [Fri, 29 May 2015 18:40:50 +0000 (18:40 +0000)]
am
c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
* commit '
c4d39dfc6c00578d4f7b9970bc9b33b237a1da54':
docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
Quddus Chong [Fri, 29 May 2015 17:51:56 +0000 (10:51 -0700)]
docs: Fix issue where images are not appearing in mobile browsers.
bug:
21517956
Change-Id: Ia00a42cd5c195881885c2f2927ada9acf2e1f453
Tyler Gunn [Fri, 29 May 2015 18:18:37 +0000 (18:18 +0000)]
Merge "Un-@hide some missed video APIs." into mnc-dev
John Spurlock [Fri, 29 May 2015 18:07:35 +0000 (18:07 +0000)]
Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 18:01:07 +0000 (18:01 +0000)]
Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
Andy Hung [Fri, 29 May 2015 17:51:49 +0000 (17:51 +0000)]
Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
Jason Monk [Fri, 29 May 2015 17:50:49 +0000 (17:50 +0000)]
Merge "Don't use string that has been removed." into mnc-dev
Jason Monk [Fri, 29 May 2015 17:44:32 +0000 (13:44 -0400)]
Don't use string that has been removed.
Change-Id: I60edc3f23f40e48013165dccab83af536582f1c4
Glenn Kasten [Fri, 29 May 2015 17:32:51 +0000 (17:32 +0000)]
James Cook [Fri, 29 May 2015 17:30:21 +0000 (17:30 +0000)]
Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
Glenn Kasten [Fri, 29 May 2015 17:18:35 +0000 (17:18 +0000)]
Andy Hung [Thu, 28 May 2015 01:57:54 +0000 (18:57 -0700)]
Clarify AudioFormat sample rate and encoding documentation
Bug:
21476142
Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1
Tyler Gunn [Fri, 29 May 2015 17:05:46 +0000 (10:05 -0700)]
Un-@hide some missed video APIs.
- renamed some methods to match what is in the non-remote version of
the API.
- Renamed RemoteConnection.VideoProvider.Listener to Callback.
Bug:
21474356
Change-Id: I4840e19921dafb4db288a4f8362b14d5dfa0aea1
Alex Klyubin [Fri, 29 May 2015 17:01:55 +0000 (10:01 -0700)]
Add algorithm aliases for Android Keystore HMACs.
The aliases have been copied from Conscrypt.
Bug:
18088752
Change-Id: I1c66d8c3655f57db41cc0b9cc88d08b44b4a774b
Alex Klyubin [Thu, 28 May 2015 18:07:19 +0000 (11:07 -0700)]
Refactor Android Keystore CipherSpi base class.
This makes Android Keystore's CipherSpi base class suitable for
implementing AES and RSA ciphers. Previously, the class was heavily
biased towards only AES.
Bug:
18088752
Change-Id: I6bd1ca54165592d28482e56471dcfe0344337cf4
Tony Mantler [Fri, 29 May 2015 16:44:28 +0000 (16:44 +0000)]
Merge "Move ZoneGetter into SettingsLib" into mnc-dev
John Spurlock [Fri, 29 May 2015 16:04:21 +0000 (12:04 -0400)]
Zen: Add warning text if total silence will eat the next alarm.
Bug:
21359239
Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0
Geoff Mendal [Fri, 29 May 2015 15:57:50 +0000 (15:57 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:57:37 +0000 (15:57 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
27c652fd0293e707110165eb1f8918f489b50fca.
Change-Id: Idb1365c91c67c0eb8f472bf6f9ace1b6429e3b0e
Geoff Mendal [Fri, 29 May 2015 15:33:29 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:33:18 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
f3173d8a1797fd812997b9246502a05df0591363.
Change-Id: I7e24d340c24f7ba4b67a72d54e57c3558caa7267
Glenn Kasten [Fri, 29 May 2015 15:11:24 +0000 (08:11 -0700)]
Fix typo
Change-Id: I21ff7773056975b6941a5f1126d43b2e04aa5cd5
Geoff Mendal [Fri, 29 May 2015 15:04:51 +0000 (15:04 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
OSDN Git Service
