OSDN Git Service
Lorenzo Colitti [Fri, 19 Dec 2014 10:41:03 +0000 (10:41 +0000)]
am
d3b8a3e7: Rename validated to everValidated.
* commit '
d3b8a3e77696ecd90ce59a869aaadf1e7804a9c8':
Rename validated to everValidated.
Lorenzo Colitti [Wed, 17 Dec 2014 02:14:42 +0000 (11:14 +0900)]
Rename validated to everValidated.
This is a straight rename and thus a complete no-op from a
functionality perspective.
Bug:
18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059
xinhe [Fri, 19 Dec 2014 03:32:58 +0000 (03:32 +0000)]
am
ffe80ab7: Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev
* commit '
ffe80ab7f68d553fbda221e3457f288a3b7baa0a':
take out SIM card, the RSSI Triangle is still full
xinhe [Fri, 19 Dec 2014 00:07:28 +0000 (00:07 +0000)]
Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev
Mike Lockwood [Thu, 18 Dec 2014 22:40:34 +0000 (22:40 +0000)]
am
8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
* commit '
8a0399c442522bf2dab20c688a99d92faa01f9b1':
BluetoothManagerService: Enforce DUMP permission
Mike Lockwood [Thu, 18 Dec 2014 22:33:59 +0000 (22:33 +0000)]
Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
vandwalle [Thu, 18 Dec 2014 22:20:27 +0000 (22:20 +0000)]
am
f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:
18706288" into lmp-mr1-dev
* commit '
f87606fe25acff86807ef0514b478359bcb52f84':
add debug logs to confirm network flapping issue is fixed Bug:
18706288
Mike Lockwood [Thu, 18 Dec 2014 22:16:36 +0000 (14:16 -0800)]
BluetoothManagerService: Enforce DUMP permission
Bug:
18667272
Change-Id: If9a510aa7b5f22b9df1d8b33f0a18183040a8cf6
vandwalle [Thu, 18 Dec 2014 22:16:29 +0000 (22:16 +0000)]
Merge "add debug logs to confirm network flapping issue is fixed Bug:
18706288" into lmp-mr1-dev
Craig Mautner [Thu, 18 Dec 2014 20:26:00 +0000 (20:26 +0000)]
am
2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev
* commit '
2281e7d6a18e4eebea602c8093ec7cb6541f2960':
Make window mgr stack movement track activity mgr
Winson Chung [Thu, 18 Dec 2014 20:25:55 +0000 (20:25 +0000)]
am
a320b217: Merge "Bug
18784289: Fix issue with transition animation callback." into lmp-mr1-dev
* commit '
a320b2176c9e6a5b3f2c3fe6f80ca9b14e088e9a':
Bug
18784289: Fix issue with transition animation callback.
Craig Mautner [Thu, 18 Dec 2014 19:55:49 +0000 (19:55 +0000)]
Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev
Winson Chung [Thu, 18 Dec 2014 19:30:38 +0000 (19:30 +0000)]
Merge "Bug
18784289: Fix issue with transition animation callback." into lmp-mr1-dev
Winson Chung [Wed, 17 Dec 2014 18:12:54 +0000 (10:12 -0800)]
Bug
18784289: Fix issue with transition animation callback.
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback. This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.
Bug:
18784289
Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
xinhe [Thu, 18 Dec 2014 18:02:14 +0000 (10:02 -0800)]
take out SIM card, the RSSI Triangle is still full
Bug:
18479509
Change-Id: I96b0e91ae42ad222889c123ebe0c0c1225d9b6a7
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
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
vandwalle [Mon, 15 Dec 2014 23:41:34 +0000 (15:41 -0800)]
add debug logs to confirm network flapping issue is fixed
Bug:
18706288
Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
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: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
Craig Mautner [Wed, 17 Dec 2014 23:45:03 +0000 (15:45 -0800)]
Make window mgr stack movement track activity mgr
There were situations where the activity manager ActivityStack was
moved to the front but the corresponding window manager TaskStack
was not. This caused the wrong activity to receive focus which led
to Application Not Responding errors.
One path in particular occurred in startActivityUncheckedLocked()
where curTop.task != intentActivity.task and
sourceStack.topActivity().task != sourceRecord.task. In this case
targetStack.moveTaskToFrontLocked() was never called.
This fix forces all calls to ActivityStack.moveToFront() to make
a call to WindowManagerService.moveTaskToTop() and eliminates
redundant calls to moveTaskToTop().
Fixes bug
17721767.
Change-Id: Ibf01389810dd36724eaec5a4a07560144b2f4cef
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: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
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
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: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: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: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: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
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
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
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: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
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
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
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: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
Sungsoo Lim [Wed, 17 Dec 2014 17:44:25 +0000 (17:44 +0000)]
am
47aafcd6: am
31d592dc: am
cd45de8b: Missing Javadoc update while API review automerge:
d0b09b0
* commit '
47aafcd66c9c703fcfd301ec850e433f40e4b190':
Missing Javadoc update while API review
Christopher Tate [Wed, 17 Dec 2014 17:44:21 +0000 (17:44 +0000)]
am
52ab8613: am
5c3e277f: Fix bad alarm delivery automerge:
be3206e
* commit '
52ab8613ea2556ad9dd5c786e0cf43eb5a4e24c9':
Fix bad alarm delivery
Christoph Studer [Wed, 17 Dec 2014 17:43:33 +0000 (17:43 +0000)]
am
3eff1e1f: am
92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
automerge:
4328588
* commit '
4328588cb532571c3b11867048d0972ff2e4d969':
Fix MediaStyle docs mentioning 2 max actions in compact view
Joe Fernandez [Wed, 17 Dec 2014 17:42:19 +0000 (17:42 +0000)]
am
6ff265cc: am
df916a89: Merge "docs: studio revision 21 update" into lmp-docs
automerge:
ca27fb9
* commit '
ca27fb9711f24df8b88a41c8a360f57c7252ba79':
docs: studio revision 21 update
Joe Fernandez [Wed, 17 Dec 2014 17:40:58 +0000 (17:40 +0000)]
am
f9ea93cd: am
80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
automerge:
e479dc2
* commit '
e479dc219ff4d289105e32264c1fa66187aa5555':
docs: studio tools help monkey update
Joe Fernandez [Wed, 17 Dec 2014 17:39:45 +0000 (17:39 +0000)]
am
b8e29d01: am
740436b6: Merge "docs: help-adt link updates" into lmp-docs
automerge:
9381301
* commit '
93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
docs: help-adt link updates
Sungsoo Lim [Wed, 17 Dec 2014 17:37:53 +0000 (17:37 +0000)]
am
31d592dc: am
cd45de8b: Missing Javadoc update while API review
automerge:
d0b09b0
* commit '
d0b09b04b8c2bf666b15fcc1c496d6ab33c44a86':
Missing Javadoc update while API review
Christopher Tate [Wed, 17 Dec 2014 17:36:46 +0000 (17:36 +0000)]
am
5c3e277f: Fix bad alarm delivery
automerge:
be3206e
* commit '
be3206ecdce7aead184e8939a29ac7dd5f91931e':
Fix bad alarm delivery
John Spurlock [Thu, 11 Dec 2014 16:29:54 +0000 (11:29 -0500)]
Audio policy: Fix deprecated shouldVibrate api.
And apply zen mode immediately to avoid race conditions
in tests.
Bug:
18702149
Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
Geoff Mendal [Wed, 17 Dec 2014 16:25:12 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 17 Dec 2014 15:43:53 +0000 (07:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib24cc684af4d1674eef4cffb4232517416f1b9b2
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Dec 2014 15:39:09 +0000 (07:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9e2ca7deb58492b7f2271715536eaaa945d21ec2
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Dec 2014 15:28:03 +0000 (15:28 +0000)]
am
0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
0de823704d94d9e9e5cceccf4573afed4fd66b28':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 15:22:28 +0000 (15:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 17 Dec 2014 15:18:42 +0000 (07:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I52f334af6fd23d7e74c142dafe7bb431604602e5
Auto-generated-cl: translation import
Christoph Studer [Wed, 17 Dec 2014 15:18:31 +0000 (15:18 +0000)]
am
0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev
* commit '
0b22e395d24cba14d4113fb326bfcb57c6aa5996':
Notification: Fix bigLargeIcon
Christoph Studer [Wed, 17 Dec 2014 15:14:00 +0000 (15:14 +0000)]
Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev
Geoff Mendal [Wed, 17 Dec 2014 14:53:37 +0000 (14:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 17 Dec 2014 14:51:23 +0000 (14:51 +0000)]
am
8f0d3694: (-s ours) Import translations. DO NOT MERGE
* commit '
8f0d3694f667263df6bed7b1c89df3911145437c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 14:50:55 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I23edfacad6257591c34c9af3b18e6ed03d3e80e4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Dec 2014 14:44:29 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib6806ea69f69ba66b4dc09a46b6e86d0ace3e734
Auto-generated-cl: translation import
Paul Jensen [Wed, 17 Dec 2014 12:59:29 +0000 (12:59 +0000)]
am
b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit '
b0575a24df6bc840d720dafa6e737cdd61fb2c6f':
Fix race between CONNECTIVITY_ACTION and setting default network.
OSDN Git Service
