OSDN Git Service
Elliott Hughes [Thu, 18 Dec 2014 02:40:10 +0000 (02:40 +0000)]
am
93241de7: Merge "Remove a bitrotted test."
automerge:
ba6982a
* commit '
ba6982a16cb3b9f6196fdac11d1d90a02eb32cfd':
Remove a bitrotted test.
Michael Runge [Thu, 18 Dec 2014 01:59:10 +0000 (01:59 +0000)]
am
37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
automerge:
8deabad
* commit '
8deabad541984571496456646d6a7a91eccc9e42':
Increase timeout when uncrypting OTA
Rich Slogar [Thu, 18 Dec 2014 01:57:51 +0000 (01:57 +0000)]
am
6dfc3aab: am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2 automerge:
85e645a
automerge:
bdc1a3d
* commit '
bdc1a3d03a8dee874e782dc9e2423571cce70406':
docs: sdk revision 24.0.2
Eric Gilmore [Thu, 18 Dec 2014 01:56:40 +0000 (01:56 +0000)]
am
2195f583: am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs. automerge:
8d2af0f
automerge:
65e7a2b
* commit '
65e7a2b74f2f01da74ae0c13ada1841b24ea5cf7':
Adding links for the last few files requested by PMs.
Pavel Zhamaitsiak [Thu, 18 Dec 2014 01:55:06 +0000 (01:55 +0000)]
am
3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev
automerge:
a0fc9f2
* commit '
a0fc9f2dd1820611295c6f83efec60c2a8f37eee':
IMS: Set phone account in IMS Conference object
Michael Runge [Thu, 18 Dec 2014 01:53:26 +0000 (01:53 +0000)]
am
37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
* commit '
37fed329adec7b339755fde0b38c687f70524e4e':
Increase timeout when uncrypting OTA
Michael Runge [Thu, 18 Dec 2014 01:49:06 +0000 (01:49 +0000)]
Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
Rich Slogar [Thu, 18 Dec 2014 01:42:45 +0000 (01:42 +0000)]
am
6dfc3aab: am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2 automerge:
85e645a
* commit '
6dfc3aab025579d0472d99fc80a1a6af0703240b':
docs: sdk revision 24.0.2
Eric Gilmore [Thu, 18 Dec 2014 01:42:40 +0000 (01:42 +0000)]
am
2195f583: am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs. automerge:
8d2af0f
* commit '
2195f58301824d995959eafab76ddc630bd0344e':
Adding links for the last few files requested by PMs.
Pavel Zhamaitsiak [Thu, 18 Dec 2014 01:34:21 +0000 (01:34 +0000)]
am
3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev
* commit '
3a35934540060441bc9f80cdf86b5013722553e2':
IMS: Set phone account in IMS Conference object
Rich Slogar [Thu, 18 Dec 2014 01:33:53 +0000 (01:33 +0000)]
am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2
automerge:
85e645a
* commit '
85e645ac2bf38186dce177e29f7062a3645c7917':
docs: sdk revision 24.0.2
Eric Gilmore [Thu, 18 Dec 2014 01:32:41 +0000 (01:32 +0000)]
am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs.
automerge:
8d2af0f
* commit '
8d2af0f9daf672183262a226e9c9410c54c133a2':
Adding links for the last few files requested by PMs.
Pavel Zhamaitsiak [Thu, 18 Dec 2014 01:27:36 +0000 (01:27 +0000)]
Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev
Rich Slogar [Thu, 18 Dec 2014 00:58:03 +0000 (00:58 +0000)]
am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2
* commit '
879cffdec9c6206a3d1f3babfef2b2940a72bfa2':
docs: sdk revision 24.0.2
Sanket Padawe [Thu, 18 Dec 2014 00:54:48 +0000 (00:54 +0000)]
am
1e63f414: am
776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev
* commit '
1e63f414ea7ecbe712e8b0dc493bb329f93e6031':
Removing unwanted tethering profiles from config.xml
Rich Slogar [Thu, 18 Dec 2014 00:51:56 +0000 (00:51 +0000)]
am
8838a9f0: docs: sdk revision 24.0.2
* commit '
8838a9f083ff2ecc748d70931e21cbd429ad0d45':
docs: sdk revision 24.0.2
Sanket Padawe [Thu, 18 Dec 2014 00:48:48 +0000 (00:48 +0000)]
am
776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev
* commit '
776164da3cd5f64de009f75f9530953fadd8626a':
Removing unwanted tethering profiles from config.xml
Sanket Padawe [Thu, 18 Dec 2014 00:44:06 +0000 (00:44 +0000)]
Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev
Rich Slogar [Tue, 16 Dec 2014 00:58:03 +0000 (16:58 -0800)]
docs: sdk revision 24.0.2
Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
Elliott Hughes [Thu, 18 Dec 2014 00:37:51 +0000 (00:37 +0000)]
am
93241de7: Merge "Remove a bitrotted test."
* commit '
93241de734c3b9cf20e8e8956e6f6ccacc5b5ef2':
Remove a bitrotted test.
Elliott Hughes [Thu, 18 Dec 2014 00:32:00 +0000 (00:32 +0000)]
Merge "Remove a bitrotted test."
Elliott Hughes [Thu, 18 Dec 2014 00:17:19 +0000 (16:17 -0800)]
Remove a bitrotted test.
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
Winson Chung [Thu, 18 Dec 2014 00:26:16 +0000 (00:26 +0000)]
am
9f48e316: am
e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug
18769791)" into lmp-mr1-dev
* commit '
9f48e3160f2768d3322670cbbcc606c9eef76bad':
Removing context ref from AppWidgetHost. (Bug
18769791)
Winson Chung [Thu, 18 Dec 2014 00:18:53 +0000 (00:18 +0000)]
am
e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug
18769791)" into lmp-mr1-dev
* commit '
e2ed349cfa838223160e83be7df144e2265cdce4':
Removing context ref from AppWidgetHost. (Bug
18769791)
Winson Chung [Thu, 18 Dec 2014 00:15:11 +0000 (00:15 +0000)]
Merge "Removing context ref from AppWidgetHost. (Bug
18769791)" into lmp-mr1-dev
Eric Gilmore [Thu, 18 Dec 2014 00:08:10 +0000 (00:08 +0000)]
am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs.
* commit '
41ea13c8d2e350bb6167b79653f2aa65fa5d84c5':
Adding links for the last few files requested by PMs.
Amit Mahajan [Thu, 18 Dec 2014 00:03:08 +0000 (00:03 +0000)]
am
e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
automerge:
eac6db5
* commit '
eac6db511b02ebf398a5e70eb70a7a5f05133945':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
Amit Mahajan [Thu, 18 Dec 2014 00:01:30 +0000 (00:01 +0000)]
am
e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
* commit '
e69b5d68c2a52d867a614ff0ca378de4ec7d0f54':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
Amit Mahajan [Wed, 17 Dec 2014 23:58:09 +0000 (23:58 +0000)]
Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
Eric Gilmore [Wed, 17 Dec 2014 23:56:21 +0000 (23:56 +0000)]
am
fe7b93f4: Adding links for the last few files requested by PMs.
* commit '
fe7b93f4f7fec93650d3faec23f9cf76841d2b9e':
Adding links for the last few files requested by PMs.
Eric Gilmore [Wed, 17 Dec 2014 23:25:51 +0000 (15:25 -0800)]
Adding links for the last few files requested by PMs.
Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
Amit Mahajan [Wed, 17 Dec 2014 23:42:56 +0000 (15:42 -0800)]
Change to write (create) setting+subid if it does not already exist
when it is queried for the first time.
Bug:
18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
Raph Levien [Wed, 17 Dec 2014 23:19:25 +0000 (23:19 +0000)]
am
3ac280c9: am
078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
* commit '
3ac280c93bdebe4ca698e9a2e3d6d2daf3598e7a':
Revert "Change Linkify leniency to VALID"
Raph Levien [Wed, 17 Dec 2014 23:15:07 +0000 (23:15 +0000)]
am
51004268: am
0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
* commit '
510042688ad8ffee499974b45551cfdf528f86da':
Preserve leading "+" in phone numbers
Raph Levien [Wed, 17 Dec 2014 23:14:13 +0000 (23:14 +0000)]
am
078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
* commit '
078ce5fc820d4744f5b1af384e427cedb7e90643':
Revert "Change Linkify leniency to VALID"
Raph Levien [Wed, 17 Dec 2014 23:09:59 +0000 (23:09 +0000)]
am
0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
* commit '
0b6e78d9971c61877ca312801fd8258aec352231':
Preserve leading "+" in phone numbers
Raph Levien [Wed, 17 Dec 2014 23:08:49 +0000 (23:08 +0000)]
Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
Raph Levien [Wed, 17 Dec 2014 23:04:15 +0000 (23:04 +0000)]
Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
Raph Levien [Wed, 17 Dec 2014 22:31:39 +0000 (14:31 -0800)]
Revert "Change Linkify leniency to VALID"
This reverts commit
9dfe86d4102b93885b947917fccee35053cfc9f2.
That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).
The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.
Bug:
18708556
Sanket Padawe [Wed, 17 Dec 2014 22:19:58 +0000 (14:19 -0800)]
Removing unwanted tethering profiles from config.xml
Bug:
18769044
Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
Chris Craik [Wed, 17 Dec 2014 22:17:21 +0000 (22:17 +0000)]
am
93492d1a: am
c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev
* commit '
93492d1a478770783abab764855c8d47e0264f71':
Revert overdraw avoidance visualization change
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug:
18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
Chris Craik [Wed, 17 Dec 2014 22:11:19 +0000 (22:11 +0000)]
am
c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev
* commit '
c748832f759cd7a390a32890530e854b9711eb7c':
Revert overdraw avoidance visualization change
Chris Craik [Wed, 17 Dec 2014 22:07:02 +0000 (22:07 +0000)]
Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev
Olawale Ogunwale [Wed, 17 Dec 2014 21:51:40 +0000 (21:51 +0000)]
am
f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe"
automerge:
fd7819d
* commit '
fd7819dbe0cf2cef9c03b2c4b04a92f0a2a36604':
Prevent wrong system ui visibility callback after the user swipe
Olawale Ogunwale [Wed, 17 Dec 2014 21:50:31 +0000 (21:50 +0000)]
am
486a9942: Merge "[ActivityManager] Use synchronized to protect object"
automerge:
e3b07b4
* commit '
e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
[ActivityManager] Use synchronized to protect object
Olawale Ogunwale [Wed, 17 Dec 2014 21:47:45 +0000 (21:47 +0000)]
am
f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe"
* commit '
f62877d305d2da4876707137cefe0eaa1b2953c3':
Prevent wrong system ui visibility callback after the user swipe
Olawale Ogunwale [Wed, 17 Dec 2014 21:47:38 +0000 (21:47 +0000)]
am
486a9942: Merge "[ActivityManager] Use synchronized to protect object"
* commit '
486a9942ebc6e3efe04004afd759a53ab96517ec':
[ActivityManager] Use synchronized to protect object
Olawale Ogunwale [Wed, 17 Dec 2014 21:43:25 +0000 (21:43 +0000)]
Merge "Prevent wrong system ui visibility callback after the user swipe"
Olawale Ogunwale [Wed, 17 Dec 2014 21:42:43 +0000 (21:42 +0000)]
Merge "[ActivityManager] Use synchronized to protect object"
Jinsuk Kim [Wed, 17 Dec 2014 21:24:50 +0000 (21:24 +0000)]
am
08ca1694: am
fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
* commit '
08ca1694eb3013bd1f6c050e021588b8614e8764':
CEC: Pass port ID for set_audio_return_channel
Jinsuk Kim [Wed, 17 Dec 2014 21:20:08 +0000 (21:20 +0000)]
am
fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
* commit '
fadfe708e6f0c74890fe2b3292a91570f3049215':
CEC: Pass port ID for set_audio_return_channel
Jinsuk Kim [Wed, 17 Dec 2014 21:15:18 +0000 (21:15 +0000)]
Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
Anju Mathapati [Wed, 17 Dec 2014 19:11:21 +0000 (11:11 -0800)]
IMS: Set phone account in IMS Conference object
Get phone account from conference host connection and set
it to ImsConference while constructing
Bug:
18690773
Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
Jeff Davidson [Wed, 17 Dec 2014 20:58:44 +0000 (20:58 +0000)]
am
0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge:
cc4f183
* commit '
0b3718d6b157bf15db9d709d50019f81f06195b9':
Add global setting for ephemeral network timeout.
Jeff Davidson [Wed, 17 Dec 2014 20:52:19 +0000 (20:52 +0000)]
Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev
automerge:
cc4f183
* commit '
cc4f18309a2a576b282a399a97a9d64d66713b89':
Add global setting for ephemeral network timeout.
Jeff Davidson [Wed, 17 Dec 2014 20:51:09 +0000 (20:51 +0000)]
Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev
Cheuksan Wang [Wed, 17 Dec 2014 20:51:09 +0000 (20:51 +0000)]
am
f1b64b4b: am
e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG:
18005911" into lmp-mr1-dev
* commit '
f1b64b4bb8300d2079696ff0d70cce16eda2be4e':
remove actions and calls for the old sms/mms api BUG:
18005911
Cheuksan Wang [Wed, 17 Dec 2014 20:45:03 +0000 (20:45 +0000)]
am
e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG:
18005911" into lmp-mr1-dev
* commit '
e8ea164596b3ab2309d7b99fa52aecd056e50e24':
remove actions and calls for the old sms/mms api BUG:
18005911
Cheuksan Wang [Wed, 17 Dec 2014 20:38:06 +0000 (20:38 +0000)]
Merge "remove actions and calls for the old sms/mms api BUG:
18005911" into lmp-mr1-dev
John Spurlock [Wed, 17 Dec 2014 20:23:55 +0000 (20:23 +0000)]
am
caba3603: am
e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
* commit '
caba360367ea9900a48066f97f4b6e59877a9df6':
Audio policy: Fix deprecated shouldVibrate api.
John Spurlock [Wed, 17 Dec 2014 20:18:03 +0000 (20:18 +0000)]
am
e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
* commit '
e7f301a05344376f9065ef09e3b3ef360469bcb3':
Audio policy: Fix deprecated shouldVibrate api.
John Spurlock [Wed, 17 Dec 2014 20:13:00 +0000 (20:13 +0000)]
Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
smain@google.com [Wed, 17 Dec 2014 20:06:02 +0000 (20:06 +0000)]
am
2448afdb: am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs automerge:
b834c72 automerge:
2a53e24 automerge:
c6de288
* commit '
2448afdb729bfab4c9e2ac8af124870fd5929a08':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
smain@google.com [Wed, 17 Dec 2014 20:00:48 +0000 (20:00 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs automerge:
b834c72 automerge:
2a53e24
automerge:
c6de288
* commit '
c6de288eabfcb6b3623fb6a6c3dba1071d7e0c78':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
smain@google.com [Wed, 17 Dec 2014 19:57:42 +0000 (19:57 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs automerge:
b834c72
automerge:
2a53e24
* commit '
2a53e24e10654b7f5667899c8a110ef6742c79e3':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
Elliott Hughes [Wed, 17 Dec 2014 19:42:08 +0000 (19:42 +0000)]
am
a1beb930: am
e6d63b94: Merge "Rewrite selectReadable JNI in Java."
* commit '
a1beb930f59ae88f4386726cdf3a7e5986bd74e1':
Rewrite selectReadable JNI in Java.
Chris Craik [Wed, 17 Dec 2014 19:10:28 +0000 (11:10 -0800)]
Revert overdraw avoidance visualization change
bug:
18787324
Partial revert of
23d307c8d88f4a3849163b9e5b7cd11d0d4f372c.
Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
Jorim Jaggi [Wed, 17 Dec 2014 19:10:43 +0000 (19:10 +0000)]
am
4a5129c8: am
c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev
* commit '
4a5129c83b92e7ae198f4b9a3018c8cdcba5dd86':
Fix colored icons in doze mode
Winson Chung [Wed, 17 Dec 2014 18:31:22 +0000 (10:31 -0800)]
Removing context ref from AppWidgetHost. (Bug
18769791)
Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
Jorim Jaggi [Wed, 17 Dec 2014 19:04:42 +0000 (19:04 +0000)]
am
c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev
* commit '
c3059b444fbd30b1344cd5ee3c7030d1e9e5c408':
Fix colored icons in doze mode
Nicolas Prevot [Wed, 17 Dec 2014 19:01:18 +0000 (19:01 +0000)]
am
f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
automerge:
47cbcd7
* commit '
47cbcd7740739796aef113646861ff7e79439a9c':
Fix the doc of addCrossProfileIntentFilter.
Jorim Jaggi [Wed, 17 Dec 2014 18:59:38 +0000 (18:59 +0000)]
Merge "Fix colored icons in doze mode" into lmp-mr1-dev
Nicolas Prevot [Wed, 17 Dec 2014 18:58:26 +0000 (18:58 +0000)]
am
f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
* commit '
f2bd50b2ec0e5d7a25694170e0dc1363465fd24e':
Fix the doc of addCrossProfileIntentFilter.
Jorim Jaggi [Tue, 16 Dec 2014 18:44:41 +0000 (19:44 +0100)]
Fix colored icons in doze mode
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.
Bug:
18537470
Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
Nicolas Prevot [Wed, 17 Dec 2014 18:54:53 +0000 (18:54 +0000)]
Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
Paul Jensen [Wed, 17 Dec 2014 18:43:36 +0000 (18:43 +0000)]
am
eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge:
ee8feae
* commit '
eece33395561fff249afc96749cd69a21c28fbac':
Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
Paul Jensen [Wed, 17 Dec 2014 18:36:31 +0000 (18:36 +0000)]
Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev
automerge:
ee8feae
* commit '
ee8feae5d4624e6759e264cc80eac28b0d0af20f':
Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
Paul Jensen [Wed, 17 Dec 2014 18:34:55 +0000 (18:34 +0000)]
Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev
Elliott Hughes [Wed, 17 Dec 2014 18:26:33 +0000 (18:26 +0000)]
am
e6d63b94: Merge "Rewrite selectReadable JNI in Java."
* commit '
e6d63b94627d0072ff1468feca71698df1a0b64e':
Rewrite selectReadable JNI in Java.
Elliott Hughes [Wed, 17 Dec 2014 18:21:06 +0000 (18:21 +0000)]
Merge "Rewrite selectReadable JNI in Java."
Narayan Kamath [Wed, 17 Dec 2014 18:14:00 +0000 (18:14 +0000)]
am
6d41504d: Merge "Move frameworks users over to libcore hex encoding API."
automerge:
681e6df1
* commit '
681e6df1221ca7671f574d368d428f62184448b0':
Move frameworks users over to libcore hex encoding API.
smain@google.com [Wed, 17 Dec 2014 18:03:39 +0000 (18:03 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
automerge:
b834c72
* commit '
b834c72e61943fda18153bb42b3c8bd80d604b0b':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
Geoff Mendal [Wed, 17 Dec 2014 18:00:07 +0000 (18:00 +0000)]
am
525833be: (-s ours) am
296aa925: (-s ours) Import translations. DO NOT MERGE automerge:
43741a8 -s ours
* commit '
525833bea31390ba3e7f72839e547b705080e4c5':
Import translations. DO NOT MERGE
smain@google.com [Wed, 17 Dec 2014 17:59:00 +0000 (17:59 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
* commit '
4842228377a292698b232f18706ce54cb7f7cc32':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
Christoph Studer [Wed, 17 Dec 2014 17:55:52 +0000 (17:55 +0000)]
am
3c0abd40: am
e326af3c: am
3eff1e1f: am
92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge:
4328588
* commit '
3c0abd408797a960f29575fe173011b87dc4ddf3':
Fix MediaStyle docs mentioning 2 max actions in compact view
Joe Fernandez [Wed, 17 Dec 2014 17:55:45 +0000 (17:55 +0000)]
am
fa7d86a1: am
e8ce10da: am
6ff265cc: am
df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge:
ca27fb9
* commit '
fa7d86a115f6c0afaf7708a936918e16cfc3aa0a':
docs: studio revision 21 update
Joe Fernandez [Wed, 17 Dec 2014 17:55:39 +0000 (17:55 +0000)]
am
425663b5: am
f9ea93cd: am
80287e76: Merge "docs: studio tools help monkey update" into lmp-docs automerge:
e479dc2 automerge:
c79d5e2
* commit '
425663b5a019fc55e4347c19f7a36d771b516b15':
docs: studio tools help monkey update
Nicolas Prevot [Wed, 17 Dec 2014 15:28:29 +0000 (15:28 +0000)]
Fix the doc of addCrossProfileIntentFilter.
Mention that cross-profile-intent-filters only work for activity intents.
BUG:
18776618
Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
Geoff Mendal [Wed, 17 Dec 2014 17:54:19 +0000 (17:54 +0000)]
am
296aa925: (-s ours) Import translations. DO NOT MERGE automerge:
43741a8 -s ours
* commit '
296aa925171b27a87b427575a9a462dc8a8620b2':
Import translations. DO NOT MERGE
smain@google.com [Wed, 17 Dec 2014 17:52:07 +0000 (17:52 +0000)]
Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
smain@google.com [Wed, 17 Dec 2014 17:50:26 +0000 (09:50 -0800)]
make hidden text hidden with negative indent to avoid horizontal scroll
bug:
18721145
Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
Christoph Studer [Wed, 17 Dec 2014 17:50:04 +0000 (17:50 +0000)]
am
e326af3c: am
3eff1e1f: am
92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge:
4328588
* commit '
e326af3cdba9f8e2a1a8626dc48524410d84e6fa':
Fix MediaStyle docs mentioning 2 max actions in compact view
Joe Fernandez [Wed, 17 Dec 2014 17:49:59 +0000 (17:49 +0000)]
am
e8ce10da: am
6ff265cc: am
df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge:
ca27fb9
* commit '
e8ce10dac8db89387d83554a8e3909cec560536a':
docs: studio revision 21 update
Joe Fernandez [Wed, 17 Dec 2014 17:49:47 +0000 (17:49 +0000)]
am
a5142ca4: am
85787187: am
b8e29d01: am
740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge:
9381301
* commit '
a5142ca4d488fa216342213784df61b2e090cacb':
docs: help-adt link updates
Sungsoo Lim [Wed, 17 Dec 2014 17:49:41 +0000 (17:49 +0000)]
am
c5023948: am
47aafcd6: am
31d592dc: am
cd45de8b: Missing Javadoc update while API review automerge:
d0b09b0
* commit '
c502394816412baf0aca28597025ecc397e14b97':
Missing Javadoc update while API review
Christopher Tate [Wed, 17 Dec 2014 17:49:36 +0000 (17:49 +0000)]
am
6f3be111: am
52ab8613: am
5c3e277f: Fix bad alarm delivery automerge:
be3206e
* commit '
6f3be11181b3c6ad020470228a87da64668a1605':
Fix bad alarm delivery
Joe Fernandez [Wed, 17 Dec 2014 17:48:33 +0000 (17:48 +0000)]
am
f9ea93cd: am
80287e76: Merge "docs: studio tools help monkey update" into lmp-docs automerge:
e479dc2
automerge:
c79d5e2
* commit '
c79d5e29de3ba4259e3c87650c77c3e87507cab0':
docs: studio tools help monkey update
Geoff Mendal [Wed, 17 Dec 2014 17:45:09 +0000 (17:45 +0000)]
Import translations. DO NOT MERGE
automerge:
43741a8 -s ours
* commit '
43741a8c8371e3a473794cc2d2a81dda777e8724':
Import translations. DO NOT MERGE
Joe Fernandez [Wed, 17 Dec 2014 17:44:30 +0000 (17:44 +0000)]
am
85787187: am
b8e29d01: am
740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge:
9381301
* commit '
85787187fca274303412a48e1fa91f7e7388ce94':
docs: help-adt link updates
OSDN Git Service
