OSDN Git Service
smain@google.com [Mon, 1 Dec 2014 20:01:10 +0000 (20:01 +0000)]
am
e979e259: am
77e889ed: am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
e979e259d22279cd35f9ebcc7b42efbae1b77ce1':
change Trulia context image
Jeremy Joslin [Mon, 1 Dec 2014 20:01:02 +0000 (20:01 +0000)]
am
33783a96: am
500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '
33783a962f3336400d12cd739ae33b9452ea14be':
Fix the ordering of extra values in the PI.
Alan Viverette [Mon, 1 Dec 2014 20:00:49 +0000 (20:00 +0000)]
am
53644fb5: am
015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '
53644fb5acd394b875723b6483215ba837f8e6c0':
Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
Geoff Mendal [Mon, 1 Dec 2014 20:00:39 +0000 (20:00 +0000)]
am
533371c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
533371c5924cc467ec8dc31cd577390a37898c8d':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 1 Dec 2014 20:00:32 +0000 (20:00 +0000)]
am
05d455ca: am
b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit '
05d455ca2b83793a81aac2544c388eec8ac140cd':
Sanitize display names, keep extensions intact.
Jeff Sharkey [Mon, 1 Dec 2014 19:57:09 +0000 (11:57 -0800)]
resolved conflicts for merge of
916d5163 to lmp-mr1-dev-plus-aosp
Change-Id: I714b443d66feb7d7416152254d21cac87a6fa451
smain@google.com [Mon, 1 Dec 2014 19:50:07 +0000 (19:50 +0000)]
am
77e889ed: am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
77e889ed84ea0f626a9164fad50299d131a1cac1':
change Trulia context image
Jason Monk [Mon, 1 Dec 2014 19:48:42 +0000 (19:48 +0000)]
am
c0c34b42: am
03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
* commit '
c0c34b428f6d3de635bc832bbebdb7b9cb500ccd':
SysUI: QS Wifi get connected wifi rssi from NC
Amith Yamasani [Mon, 1 Dec 2014 19:48:36 +0000 (19:48 +0000)]
am
0c81034c: am
731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
* commit '
0c81034cac4efe7d538ff303cc9f2badbb22b8d8':
Fix parsing bug that affects reading back guest restrictions
Geoff Mendal [Mon, 1 Dec 2014 19:48:20 +0000 (19:48 +0000)]
am
e7f81f3b: (-s ours) am
6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
e7f81f3b684bde04432889943c5085ed1d2b9b1b':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Dec 2014 19:47:58 +0000 (19:47 +0000)]
am
23a99a3a: am
21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '
23a99a3ab09d90e3613b44a0962de7ed0028d620':
Volume: Improve inline volume controls used in settings.
Ihab Awad [Mon, 1 Dec 2014 19:47:23 +0000 (19:47 +0000)]
am
8199d6c3: am
6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev
* commit '
8199d6c3db16d786f15f1d643afe599dcfa6cf1e':
Telecom API updates (1/6)
Chet Haase [Mon, 1 Dec 2014 19:47:15 +0000 (19:47 +0000)]
am
8394e9ff: am
21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
* commit '
8394e9fff32c8935e021f0e4e84c5c1de913b96f':
Zero duration animations snap to end value when started
Geoff Mendal [Mon, 1 Dec 2014 19:47:03 +0000 (19:47 +0000)]
am
9e863741: (-s ours) am
3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
9e8637411a2a637e5795ff721ea6a92141cf76ec':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 19:46:57 +0000 (19:46 +0000)]
am
11fe2dfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
11fe2dfd3267c86c598dd443aaf471e8d490b4bb':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Dec 2014 19:46:50 +0000 (19:46 +0000)]
am
64e034e3: am
e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit '
64e034e351ad73b9cb99cb04511d0fea137c7a3b':
Zen: Improve zen mode panel condition selection.
John Spurlock [Mon, 1 Dec 2014 19:46:44 +0000 (19:46 +0000)]
am
c1e4d155: am
1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
* commit '
c1e4d1554f23db7f0de91a212d94a1b624dec64d':
Doze: Break out proxcheck stats by pulse reason.
John Spurlock [Mon, 1 Dec 2014 19:46:38 +0000 (19:46 +0000)]
am
fdc07dce: am
26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev
* commit '
fdc07dce372e94b274b725ba571c2ad4979565da':
Volume: Update remote volume icons.
Geoff Mendal [Mon, 1 Dec 2014 19:46:31 +0000 (19:46 +0000)]
am
68137588: (-s ours) am
9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit '
68137588d1a1924703a2b995b15293515c4ff418':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 19:46:24 +0000 (19:46 +0000)]
am
a990faec: (-s ours) Import translations. DO NOT MERGE
* commit '
a990faec871f4ca369e17c7bd36488747e890bc9':
Import translations. DO NOT MERGE
Wally Yau [Mon, 1 Dec 2014 19:46:11 +0000 (19:46 +0000)]
am
5b4e2e02: am
da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '
5b4e2e02744c676f2d282388c0d901494fe8a5b9':
Set stream volume to max when userMasterVolume is set to true.
Elliott Hughes [Mon, 1 Dec 2014 19:45:32 +0000 (19:45 +0000)]
am
7ff0b469: am
07b4a291: am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
7ff0b469950c225ab3a8a245b6c5ff49ba38497e':
Mention ProGuard in the JNI documentation.
smain@google.com [Mon, 1 Dec 2014 19:43:58 +0000 (19:43 +0000)]
am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
446bab79564e50c497e6ce5cf75a30ddd94855fe':
change Trulia context image
Jeremy Joslin [Mon, 1 Dec 2014 19:42:24 +0000 (19:42 +0000)]
am
500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '
500f781110dee5aad53410e9ef9b4003123c6981':
Fix the ordering of extra values in the PI.
Jeremy Joslin [Mon, 1 Dec 2014 19:36:01 +0000 (19:36 +0000)]
Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
Adrian Roos [Mon, 1 Dec 2014 19:33:21 +0000 (19:33 +0000)]
am
17e0a7e7: am
09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev
* commit '
17e0a7e7ac289deacff01c84591dae4009f86415':
Fix projection permission dialog layering
Geoff Mendal [Mon, 1 Dec 2014 19:32:36 +0000 (19:32 +0000)]
am
de3f61f4: (-s ours) am
7028dec6: (-s ours) am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
de3f61f46616ed42c03fc8f171324e011ddbcc5d':
Import translations. DO NOT MERGE
Scott Main [Mon, 1 Dec 2014 19:32:31 +0000 (19:32 +0000)]
am
cd79f9f0: am
4a45a441: am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
cd79f9f0f4a3fb3527023450839313aa67e5e106':
docs:advmgr-updates
smain@google.com [Mon, 1 Dec 2014 19:32:25 +0000 (19:32 +0000)]
am
b8de593e: am
576e248f: am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
b8de593ec2ca04009835960357c59feff28af551':
define height for context images to avoid content jumps on load
Narayan Kamath [Mon, 1 Dec 2014 19:32:12 +0000 (19:32 +0000)]
am
ff45e7df: am
1d184ace: resolved conflicts for merge of
7377998d to lmp-mr1-dev
* commit '
ff45e7df8aae0f55ce719de92102c7d522b62048':
Be increasingly aggressive about fstrim if it isn't being run
Amit Mahajan [Mon, 1 Dec 2014 19:32:06 +0000 (19:32 +0000)]
am
b957d11a: am
4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
* commit '
b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
Change to use DATA_ROAMING setting correctly with subId.
Alan Viverette [Mon, 1 Dec 2014 19:17:30 +0000 (19:17 +0000)]
am
015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '
015b9e56d4ad528dd406672ef6264c85e41a20fd':
Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
Alan Viverette [Mon, 1 Dec 2014 19:12:47 +0000 (19:12 +0000)]
Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 19:04:58 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Jeff Sharkey [Mon, 1 Dec 2014 19:00:56 +0000 (19:00 +0000)]
am
b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit '
b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
Sanitize display names, keep extensions intact.
Jeff Sharkey [Mon, 1 Dec 2014 19:00:51 +0000 (19:00 +0000)]
am
e4a5faa6: Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
* commit '
e4a5faa61e9084333b241531ddb941684f110566':
APK still has privileged flag after being moved from "/system/priv-app"
Geoff Mendal [Mon, 1 Dec 2014 18:59:03 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic9c2d5dfcae9b229040c8460ab2a9820d44fa18c
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 1 Dec 2014 18:57:02 +0000 (18:57 +0000)]
Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
Jeff Sharkey [Mon, 1 Dec 2014 18:56:55 +0000 (18:56 +0000)]
Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
Jason Monk [Mon, 1 Dec 2014 18:38:19 +0000 (18:38 +0000)]
am
03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
* commit '
03d705abd60dcd918ae7dcce4c9c48299c1c4995':
SysUI: QS Wifi get connected wifi rssi from NC
Amith Yamasani [Mon, 1 Dec 2014 18:38:14 +0000 (18:38 +0000)]
am
731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
* commit '
731a5c1a29e5bdbf6e7e4bade9b80f7abe6ec37e':
Fix parsing bug that affects reading back guest restrictions
Jason Monk [Mon, 1 Dec 2014 18:33:37 +0000 (18:33 +0000)]
Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
Amith Yamasani [Mon, 1 Dec 2014 18:32:10 +0000 (18:32 +0000)]
Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
smain@google.com [Mon, 1 Dec 2014 18:08:58 +0000 (18:08 +0000)]
am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
7512a46e7e9dfcd6e522e8229b91a63b9e9189de':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 18:04:39 +0000 (18:04 +0000)]
am
fdff66ee: change Trulia context image
* commit '
fdff66ee030869f0f5cb3d1614d66f7d087e2008':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 17:40:42 +0000 (09:40 -0800)]
change Trulia context image
Change-Id: I99e43b358af518750cf7ddae4856bb8ee42729f5
Jeff Sharkey [Wed, 26 Nov 2014 21:38:26 +0000 (13:38 -0800)]
Sanitize display names, keep extensions intact.
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames. This also fixes
a handful of directory traversal bugs.
Also relax logic around generating display names to allow any
extension which maps to the requested MIME type. Tests to verify.
Bug:
18512473,
18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
Akira Numata [Tue, 25 Nov 2014 08:50:12 +0000 (17:50 +0900)]
APK still has privileged flag after being moved from "/system/priv-app"
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.
(cherry picked from commit
76bf60ead8132b86436ebbba40eaa8f2c8bbe812)
Change-Id: I39feeac7ece89c28045d196ae69fc974b1c6510b
Geoff Mendal [Mon, 1 Dec 2014 17:31:28 +0000 (17:31 +0000)]
am
6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
6ca3ba73b78be57dd50fe5813f076b3e166cc659':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 17:26:18 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 17:24:52 +0000 (09:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d79c516d1b137f23ec8f4178d156f9bc0f57676
Auto-generated-cl: translation import
Jason Monk [Fri, 21 Nov 2014 16:08:55 +0000 (11:08 -0500)]
SysUI: QS Wifi get connected wifi rssi from NC
Get the connected rssi for WiFi QS panel from NetworkController to
ensure it matches the status bar/QS.
Bug:
18479823
Change-Id: I82ca0cc9169a91b4e0ae6f07008d48fdb7b820f0
John Spurlock [Mon, 1 Dec 2014 17:11:21 +0000 (17:11 +0000)]
am
21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '
21d68f4808db02aa3252ba5dec8b0220d053cab3':
Volume: Improve inline volume controls used in settings.
John Spurlock [Mon, 1 Dec 2014 17:06:12 +0000 (17:06 +0000)]
Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
Craig Mautner [Mon, 1 Dec 2014 16:49:34 +0000 (16:49 +0000)]
am
b5981aa8: am
ee7c30e1: Merge "Avoid capture all black screenshot bitmap"
* commit '
b5981aa8d18dbd952ff74a75f962d4ec98f38807':
Avoid capture all black screenshot bitmap
Craig Mautner [Mon, 1 Dec 2014 16:44:24 +0000 (16:44 +0000)]
am
ee7c30e1: Merge "Avoid capture all black screenshot bitmap"
* commit '
ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3':
Avoid capture all black screenshot bitmap
Craig Mautner [Mon, 1 Dec 2014 16:38:14 +0000 (16:38 +0000)]
Merge "Avoid capture all black screenshot bitmap"
Ihab Awad [Mon, 1 Dec 2014 16:29:35 +0000 (16:29 +0000)]
am
6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev
* commit '
6cacf44e7ecfe50097adc99dab97c3fb9770a1af':
Telecom API updates (1/6)
Ihab Awad [Mon, 1 Dec 2014 16:24:16 +0000 (16:24 +0000)]
Merge "Telecom API updates (1/6)" into lmp-mr1-dev
Chet Haase [Mon, 1 Dec 2014 15:58:46 +0000 (15:58 +0000)]
am
21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
* commit '
2187144408dbdb5322a2212fa2e68a5891ea60ca':
Zero duration animations snap to end value when started
Chet Haase [Mon, 1 Dec 2014 15:52:58 +0000 (15:52 +0000)]
Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 15:11:25 +0000 (15:11 +0000)]
am
3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
3fbf3b939abbc681f6812a429e2b809358deb7c3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 15:10:35 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 1 Dec 2014 15:09:47 +0000 (07:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5278b3f5da079c97f9aafd947fef96ae3248778
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 15:07:54 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 15:04:02 +0000 (15:04 +0000)]
am
e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit '
e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
Zen: Improve zen mode panel condition selection.
John Spurlock [Mon, 1 Dec 2014 15:03:57 +0000 (15:03 +0000)]
am
1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
* commit '
1a3af711ab6f811a6bc4e9211cb255721fb1847d':
Doze: Break out proxcheck stats by pulse reason.
John Spurlock [Mon, 1 Dec 2014 15:03:52 +0000 (15:03 +0000)]
am
26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev
* commit '
26a695d974f7ee3b32b8d65a44a42f804af8f01c':
Volume: Update remote volume icons.
Geoff Mendal [Mon, 1 Dec 2014 15:02:48 +0000 (07:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1475c76eb44b69ef727a11f409e7d938552ee26d
Auto-generated-cl: translation import
John Spurlock [Mon, 1 Dec 2014 14:59:03 +0000 (14:59 +0000)]
Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 14:58:36 +0000 (14:58 +0000)]
Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 14:58:16 +0000 (14:58 +0000)]
Merge "Volume: Update remote volume icons." into lmp-mr1-dev
Chet Haase [Mon, 1 Dec 2014 14:57:15 +0000 (06:57 -0800)]
Zero duration animations snap to end value when started
A recent change to seeking behavior altered the logic of
setCurrentPlayTime() (which is called when animations are first
started) to set the current animated fraction to 0 for 0-duration
animations. This fix ensures that 0-duration animations snap to
their end value (fraction == 1) instead, matching the behavior
prior to the seeking fix.
Issue #
18542543 Animations with 0 duration stay in initial state when calling setCurrentPlayTime(0)
Change-Id: I9916d962cf46453a9e3e1207f58baf16f4a5830a
Geoff Mendal [Mon, 1 Dec 2014 14:52:53 +0000 (14:52 +0000)]
am
9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit '
9cde3e1d82f65eaf73ccf92f14b101e600ef8e18':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 14:40:31 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I372891f089f72f814e92a63ac7f78a25cee9ebbf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 14:36:32 +0000 (06:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
Wally Yau [Mon, 1 Dec 2014 13:13:54 +0000 (13:13 +0000)]
am
da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '
da39290460b30e5080769f039d6dff352b3c7808':
Set stream volume to max when userMasterVolume is set to true.
Yohann Roussel [Mon, 1 Dec 2014 10:12:09 +0000 (10:12 +0000)]
am
3e5223fd: am
6829daa4: Merge "Add tests about annotations and enum."
* commit '
3e5223fd02d0f096ca50c964378c717adbb2e3e9':
Add tests about annotations and enum.
Yohann Roussel [Mon, 1 Dec 2014 10:05:45 +0000 (10:05 +0000)]
am
6829daa4: Merge "Add tests about annotations and enum."
* commit '
6829daa44a66333ef869dbcd655eac220c34561b':
Add tests about annotations and enum.
Yohann Roussel [Mon, 1 Dec 2014 09:30:59 +0000 (09:30 +0000)]
Merge "Add tests about annotations and enum."
tingna_sung [Tue, 21 Oct 2014 05:22:16 +0000 (13:22 +0800)]
Avoid capture all black screenshot bitmap
Captured screenshot bitmap is all black one if none of windows is
surface shown.
Change-Id: I651b2ade1865926d61f945167d60219535fa8bf8
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Michael Wright [Mon, 1 Dec 2014 05:27:15 +0000 (05:27 +0000)]
am
fa910081: am
461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
* commit '
fa9100814a9139447e91edf9075a9fe55b044345':
Add keylayout for Logitech RedHawk Gamepad
Craig Mautner [Mon, 1 Dec 2014 05:27:08 +0000 (05:27 +0000)]
am
be342ef0: am
c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
* commit '
be342ef034f05c6864aaa85ab25c009148954552':
[ActivityManager] Ensure provider external access count will be released.
Craig Mautner [Mon, 1 Dec 2014 05:27:00 +0000 (05:27 +0000)]
am
a12ac54c: am
25596374: Merge "[ActivityManager] Prevent provider from been created twice."
* commit '
a12ac54cf69c0c8cfec6fa7c14176b714cae7107':
[ActivityManager] Prevent provider from been created twice.
Craig Mautner [Mon, 1 Dec 2014 05:26:53 +0000 (05:26 +0000)]
am
6151b118: am
94ac906b: Merge "Fix pointer index out of range exception"
* commit '
6151b118b663b0620fee4fb87d9d143c6fd050b8':
Fix pointer index out of range exception
Craig Mautner [Mon, 1 Dec 2014 05:26:47 +0000 (05:26 +0000)]
am
fac55682: am
208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
* commit '
fac55682148e6d9c6b4e24769369e2b76ab018ac':
[ActivityManager] Avoid system server crash due to package removed
Craig Mautner [Mon, 1 Dec 2014 05:26:37 +0000 (05:26 +0000)]
am
11c67c92: am
7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
* commit '
11c67c92de3522a50b9994eb83e34c152902ad18':
Reset killedByAm flag at attachApplicationLocked
Craig Mautner [Mon, 1 Dec 2014 05:15:34 +0000 (21:15 -0800)]
resolved conflicts for merge of
082c0540 to lmp-mr1-dev-plus-aosp
Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903
Michael Wright [Mon, 1 Dec 2014 04:43:34 +0000 (04:43 +0000)]
am
461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
* commit '
461eaf79a726f5a754f467d7f3dd163aaa463857':
Add keylayout for Logitech RedHawk Gamepad
Michael Wright [Mon, 1 Dec 2014 04:36:23 +0000 (04:36 +0000)]
Merge "Add keylayout for Logitech RedHawk Gamepad"
Craig Mautner [Mon, 1 Dec 2014 00:26:11 +0000 (00:26 +0000)]
am
c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
* commit '
c4cf78f4d3154af317e686c9ef702a26cf28f8f2':
[ActivityManager] Ensure provider external access count will be released.
Craig Mautner [Mon, 1 Dec 2014 00:22:10 +0000 (00:22 +0000)]
am
25596374: Merge "[ActivityManager] Prevent provider from been created twice."
* commit '
255963742982daf46eb665a2934bd61e7ed95c81':
[ActivityManager] Prevent provider from been created twice.
Craig Mautner [Mon, 1 Dec 2014 00:20:33 +0000 (00:20 +0000)]
Merge "[ActivityManager] Ensure provider external access count will be released."
Craig Mautner [Mon, 1 Dec 2014 00:16:57 +0000 (00:16 +0000)]
am
94ac906b: Merge "Fix pointer index out of range exception"
* commit '
94ac906b103b0f03eca2000815bf306209f33109':
Fix pointer index out of range exception
Craig Mautner [Mon, 1 Dec 2014 00:16:52 +0000 (00:16 +0000)]
am
208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
* commit '
208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
[ActivityManager] Avoid system server crash due to package removed
Craig Mautner [Mon, 1 Dec 2014 00:16:38 +0000 (00:16 +0000)]
Merge "[ActivityManager] Prevent provider from been created twice."
Craig Mautner [Mon, 1 Dec 2014 00:13:27 +0000 (00:13 +0000)]
Merge "Fix pointer index out of range exception"
Craig Mautner [Mon, 1 Dec 2014 00:11:51 +0000 (00:11 +0000)]
Merge "[ActivityManager] Avoid system server crash due to package removed"
Craig Mautner [Sun, 30 Nov 2014 23:59:46 +0000 (23:59 +0000)]
am
7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
* commit '
7db48ed03623834f7b8b420c83ab7916f6b39a8a':
Reset killedByAm flag at attachApplicationLocked
Craig Mautner [Sun, 30 Nov 2014 23:59:40 +0000 (23:59 +0000)]
am
728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly"
* commit '
728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc':
Prevent showing immersive confirmation unexpectedly
OSDN Git Service
