OSDN Git Service
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 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
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
Tony Mantler [Fri, 29 May 2015 16:44:28 +0000 (16:44 +0000)]
Merge "Move ZoneGetter into SettingsLib" into mnc-dev
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
Geoff Mendal [Fri, 29 May 2015 15:04:40 +0000 (15:04 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
29af96c4486c1baf8601482e54e6886139f49546.
Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d
John Spurlock [Fri, 29 May 2015 15:03:14 +0000 (15:03 +0000)]
Merge "Tuner: add battery pct preference." into mnc-dev
John Spurlock [Fri, 29 May 2015 14:48:22 +0000 (10:48 -0400)]
Tuner: add battery pct preference.
And fix questionable code organization choices in BatteryMeterView.
Change-Id: I7c13197892b33aa0df9af51fbabb81e0ad0e00e1
Geoff Mendal [Fri, 29 May 2015 14:51:55 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:51:27 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:50:28 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:49:43 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:38:08 +0000 (09:38 -0500)]
Import translations. DO NOT MERGE
Change-Id: I22703941cc87c8ad2aacc04671d3c62cb1e81037
Auto-generated-cl: translation import
Geoff Mendal [Fri, 29 May 2015 14:31:36 +0000 (07:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I30219f300510a51079cb2e514c00f476590e06d5
Auto-generated-cl: translation import
Geoff Mendal [Fri, 29 May 2015 14:28:27 +0000 (09:28 -0500)]
Import translations. DO NOT MERGE
Change-Id: I290120b9af321f28cbf754ebc76a154e8b806ddf
Auto-generated-cl: translation import
Geoff Mendal [Fri, 29 May 2015 14:27:57 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08da4367a1ba723e7dfb701f47fba96b548e7f86
Auto-generated-cl: translation import
Xiyuan Xia [Fri, 29 May 2015 14:24:20 +0000 (14:24 +0000)]
Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:10:35 +0000 (09:10 -0500)]
Import translations. DO NOT MERGE
Change-Id: I6fbaa6bb785894851b344f414fe5c8f830adbde3
Auto-generated-cl: translation import
Narayan Kamath [Fri, 29 May 2015 14:04:40 +0000 (14:04 +0000)]
Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
Narayan Kamath [Thu, 28 May 2015 10:23:57 +0000 (11:23 +0100)]
Avoid inspecting packages twice to deduce ABIs for moves / installs.
In the case of moves, we can use the existing ABIs from settings because
a move will not result in an ABI change. For new installs, we can just
use the ABI we deduced for compiling (dex2oat) the package.
bug:
21144503
Change-Id: I35e2e8abd47f547b6252271fc6b41d30719c4298
John Spurlock [Fri, 29 May 2015 13:22:31 +0000 (13:22 +0000)]
Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
Selim Cinek [Fri, 29 May 2015 12:39:08 +0000 (05:39 -0700)]
Increased the falsing treashold for quick settings
Bug:
21433654
Change-Id: I593297e4577a40762e926353da046a53b9876245
Dirk Dougherty [Fri, 29 May 2015 07:00:58 +0000 (07:00 +0000)]
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 '
906a91b4e794015bb2609ded232bb50d4478c3c7':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
Dirk Dougherty [Fri, 29 May 2015 06:48:57 +0000 (06:48 +0000)]
am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
08710f1b69e2188a439b54f1ae59a574f71681d0':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
Dirk Dougherty [Fri, 29 May 2015 05:01:36 +0000 (22:01 -0700)]
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
Change-Id: I7824c45a81078c1527a5b8bc20b2a9ac6773a5ad
David Friedman [Fri, 29 May 2015 05:45:00 +0000 (05:45 +0000)]
am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
2ed3a89c1b6c57b45b08ab9e6bcf29c33d82cdd2':
Docs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 05:31:56 +0000 (05:31 +0000)]
am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
90042a5f8c987582736f4eed714aeba9416003c6':
Docs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 04:07:46 +0000 (21:07 -0700)]
Docs: Corrects technical content of one sentence, and deletes another.
Change-Id: Iaf894f9d9d68e4e2be9a1d1f8173b83a781241f4
Guang Zhu [Fri, 29 May 2015 03:50:03 +0000 (20:50 -0700)]
fix NPE in shutdown thread
null reboot reason is used when it's a simple reboot.
Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
Andrew Solovay [Fri, 29 May 2015 02:28:05 +0000 (02:28 +0000)]
am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
2f85475c18d68d8719f20e4385dccb3ba0117d1a':
docs: Quick spelling fix
Yorke Lee [Fri, 29 May 2015 02:23:34 +0000 (02:23 +0000)]
am
d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
* commit '
d600966c396ce457062795893a7972f3bf2b3617':
Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Glenn Kasten [Fri, 29 May 2015 02:23:22 +0000 (02:23 +0000)]
am
ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
* commit '
ad43220384f2ee1627397cafeac34144dbfda8d6':
Improve error handling for AudioTrack write with PTS
Raph Levien [Fri, 29 May 2015 02:23:16 +0000 (02:23 +0000)]
am
71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '
71a2876497385cd61083cf3a7a86db068ae4b0b3':
Use getRunAdvance to position cursor
Alan Viverette [Fri, 29 May 2015 02:23:07 +0000 (02:23 +0000)]
am
a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
* commit '
a4d66f3933d2369a87e7c3d36e69244ff2029e74':
Synchronize Theme.Material and Theme.Material light attributes
Makoto Onuki [Fri, 29 May 2015 02:23:01 +0000 (02:23 +0000)]
am
0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev
* commit '
0d889cdeb78410cd4cb7f05d7fa4820985f0d679':
CountryDetector no longer requires location permissions.
Yohei Yukawa [Fri, 29 May 2015 02:22:52 +0000 (02:22 +0000)]
am
5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '
5176b5451a8447de3ff86712a95efd6af93aa556':
Rely on IMM#focusOut() to close input session.
Brian Attwell [Fri, 29 May 2015 02:22:46 +0000 (02:22 +0000)]
am
19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
* commit '
19d9d0ca2e95eca34e8f7b28023aa10f15d82f88':
Rename "end" to "endExclusive" in addPhoneTtsSpan
Alan Viverette [Fri, 29 May 2015 02:22:41 +0000 (02:22 +0000)]
am
3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
* commit '
3c436cb99f1cc0db82e342fb9dc145fd524f5029':
Postpone AnimatedVectorDrawable animator inflation until applyTheme()
Andres Morales [Fri, 29 May 2015 02:22:33 +0000 (02:22 +0000)]
am
a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '
a5705a4ada8e719ebf73ed757c514b74785e7ae3':
[partition checking] re-enable bootimage/bootloader, add recovery
Andrew Solovay [Fri, 29 May 2015 02:15:04 +0000 (02:15 +0000)]
am
7d36a250: docs: Quick spelling fix
* commit '
7d36a25097099b958262e90d22992ce4cac485c9':
docs: Quick spelling fix
John Spurlock [Fri, 29 May 2015 02:13:03 +0000 (22:13 -0400)]
Zen: Use account name instead of calendar id in event conditions.
- Migrate the existing calendar attribute in the event condition
from a long calendar id to the calendar account name. More
portable across a backup/restore.
- Also skip restoring transient state (like the current condition
state) from restored automatic rules.
Bug:
17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2
Sungsoo Lim [Fri, 29 May 2015 01:36:57 +0000 (01:36 +0000)]
Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
Andrew Solovay [Fri, 29 May 2015 01:33:29 +0000 (18:33 -0700)]
docs: Quick spelling fix
Fix is quick and the misspelling was embarassing (spelled channel as
"chanel" three times) so I'm just going to +2 this myself.
Change-Id: Icc4dcd5f47ba2337db29cc81b6afe426e6986e95
Yorke Lee [Fri, 29 May 2015 00:55:11 +0000 (00:55 +0000)]
Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
Glenn Kasten [Fri, 29 May 2015 00:12:53 +0000 (00:12 +0000)]
Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
Raph Levien [Fri, 29 May 2015 00:05:07 +0000 (00:05 +0000)]
Merge "Use getRunAdvance to position cursor" into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:55:30 +0000 (23:55 +0000)]
Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
Makoto Onuki [Thu, 28 May 2015 23:54:08 +0000 (23:54 +0000)]
Merge "CountryDetector no longer requires location permissions." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:52:49 +0000 (23:52 +0000)]
Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:52:29 +0000 (16:52 -0700)]
Synchronize Theme.Material and Theme.Material light attributes
Adds a few attributes that were missing from either theme, ensures all
the attributes match up so that it's easier to scan through for errors.
Bug:
21490615
Change-Id: Iabfed8f61a7bc121e618164dee4121c41e82db09
Brian Attwell [Thu, 28 May 2015 23:43:39 +0000 (23:43 +0000)]
Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:43:22 +0000 (23:43 +0000)]
Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
Andres Morales [Thu, 28 May 2015 23:41:03 +0000 (23:41 +0000)]
Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
Raph Levien [Thu, 28 May 2015 23:16:24 +0000 (16:16 -0700)]
Use getRunAdvance to position cursor
TextLine used to use getTextRunAdvances on a substring to compute a
cursor position, but this had a number of problems, especially when
the substring is a wider than the full string (as can happen in
certain Tamil ligatures).
This patch changes the implementation to use getRunAdvance, which was
explicitly designed for this use case.
We should also change Layout.getHorizontal to use the dual
getOffsetForAdvance, but that's basically a performance optimization,
the functionality should be basically equivalent.
Bug:
21125816
Change-Id: I669b85eaecfbf6f7aa6c6a9dddbf1a210eb94571
Yohei Yukawa [Thu, 28 May 2015 23:35:28 +0000 (23:35 +0000)]
am
85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
* commit '
85b883cae410bd2b8e1dc5c34265ed253d758e86':
Clear the inset of previous IME when necessary.
Brian Attwell [Thu, 28 May 2015 23:23:37 +0000 (16:23 -0700)]
Rename "end" to "endExclusive" in addPhoneTtsSpan
Bug:
21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
Yohei Yukawa [Thu, 28 May 2015 23:20:11 +0000 (23:20 +0000)]
Merge "Clear the inset of previous IME when necessary." into mnc-dev
Santos Cordon [Thu, 28 May 2015 23:18:34 +0000 (23:18 +0000)]
am
7cb0925e: Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev
* commit '
7cb0925e7e89a415a101f83e32d4f5e51f768ffd':
Add extras to Connections/Calls. (1/3)
Amit Mahajan [Thu, 28 May 2015 23:18:29 +0000 (23:18 +0000)]
am
ff0c25ce: Merge "Cleaning up logging in TelephonyManager." into mnc-dev
* commit '
ff0c25ce3174bd4f76256e413beb81f6eb501da9':
Cleaning up logging in TelephonyManager.
David Friedman [Thu, 28 May 2015 23:18:24 +0000 (23:18 +0000)]
am
36756947: am
c397dde1: am
92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '
3675694775d69712a2c9d5ee1d39dd2a5127cc86':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
Yorke Lee [Thu, 28 May 2015 22:46:12 +0000 (15:46 -0700)]
Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Bug:
21499146
Change-Id: I3b931231807eec0aed91832013c7c055005fc9ad
Santos Cordon [Thu, 28 May 2015 23:06:15 +0000 (23:06 +0000)]
Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev
Amit Mahajan [Thu, 28 May 2015 23:05:27 +0000 (23:05 +0000)]
Merge "Cleaning up logging in TelephonyManager." into mnc-dev
Doris Liu [Thu, 28 May 2015 22:57:22 +0000 (22:57 +0000)]
am
a9ac8354: Merge "Clean up calls to Rect.intersect()" into mnc-dev
* commit '
a9ac835437f45c7f7f3fc53f56aec2d53390fa72':
Clean up calls to Rect.intersect()
Glenn Kasten [Thu, 28 May 2015 22:57:17 +0000 (22:57 +0000)]
am
626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev
* commit '
626f0dc73bc1007d16688eddf29ea58ec26f424e':
Deprecations are warnings not errors
OSDN Git Service
