OSDN Git Service
Fyodor Kupolov [Thu, 27 Aug 2015 09:03:04 +0000 (09:03 +0000)]
am
5ddefc17: (-s ours) am
a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
* commit '
5ddefc174cd58487dfd7079b0f4c39bf19db4ae4':
Andrei Stingaceanu [Thu, 27 Aug 2015 09:02:40 +0000 (09:02 +0000)]
am
da905717: (-s ours) am
45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
* commit '
da90571750c15da557c9f807fe86f9a09ce9e473':
Julia Reynolds [Thu, 27 Aug 2015 09:02:26 +0000 (09:02 +0000)]
am
71a7651a: (-s ours) am
ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
* commit '
71a7651abd4d6408480817088b579f9114aa6e5c':
Jim Miller [Thu, 27 Aug 2015 09:02:10 +0000 (09:02 +0000)]
am
a8bc790a: (-s ours) am
abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
a8bc790a60a23ce281d59d8f3d34f6fde70c8242':
Ying Wang [Thu, 27 Aug 2015 09:01:53 +0000 (09:01 +0000)]
am
25e10e35: (-s ours) am
802da28f: am
430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
* commit '
25e10e353d3532cf6780145b6b4979f6b3855c09':
Jean-Michel Trivi [Thu, 27 Aug 2015 09:01:29 +0000 (09:01 +0000)]
am
e14a2f33: (-s ours) am
7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
* commit '
e14a2f3355328f13d12b70e372120022bba9df9f':
John Reck [Thu, 27 Aug 2015 09:00:56 +0000 (09:00 +0000)]
am
549dfccc: (-s ours) am
6b66a4a8: use findProcess instead of getProcess
* commit '
549dfccc35ebf4b27eac9419eb451c6040c97bf2':
Amit Mahajan [Thu, 27 Aug 2015 09:00:11 +0000 (09:00 +0000)]
am
83c7c06d: (-s ours) am
eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
* commit '
83c7c06d05176390033290d1f7a07a4064239fd2':
Adrian Roos [Thu, 27 Aug 2015 08:59:23 +0000 (08:59 +0000)]
am
30a03425: (-s ours) am
0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit '
30a03425b256a466da5c3d364b157f9af509f3dc':
Svetoslav Ganov [Thu, 27 Aug 2015 08:58:44 +0000 (08:58 +0000)]
am
056b71c0: (-s ours) am
28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
* commit '
056b71c05fd92cb0b323a0b185ca74487b03aabb':
John Reck [Thu, 27 Aug 2015 08:58:27 +0000 (08:58 +0000)]
am
1f4b21b9: (-s ours) am
8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '
1f4b21b94c913592135b7ed0e869780723c49040':
Deepanshu Gupta [Thu, 27 Aug 2015 08:58:11 +0000 (08:58 +0000)]
am
fe4ff64a: (-s ours) am
f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
* commit '
fe4ff64a3b9dac56ec02a1a3d51b88576e73a43b':
Yohei Yukawa [Thu, 27 Aug 2015 08:57:48 +0000 (08:57 +0000)]
am
0e235f47: (-s ours) am
0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
* commit '
0e235f47530b3fefe84967a682646f9e28e9e717':
Deepanshu Gupta [Thu, 27 Aug 2015 08:57:09 +0000 (08:57 +0000)]
am
b8719e27: (-s ours) am
49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev
* commit '
b8719e27eb8d2fe289fb91055c6fae6c91c24211':
Deepanshu Gupta [Thu, 27 Aug 2015 08:56:37 +0000 (08:56 +0000)]
am
a6d25c84: (-s ours) am
f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
* commit '
a6d25c84cd2c8028970af3c60d58ca426058cb7d':
Stephen Hines [Thu, 27 Aug 2015 08:56:12 +0000 (08:56 +0000)]
am
b3a1674a: (-s ours) am
ed3ffe0f: am
6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
* commit '
b3a1674a47f8671f0e35e63c8d2ba7b3b73abc59':
Tim Kilbourn [Thu, 27 Aug 2015 08:55:58 +0000 (08:55 +0000)]
am
43250dd3: (-s ours) am
a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit '
43250dd37f1843f1e0a8ff19aaae287a41f3094b':
Svetoslav Ganov [Thu, 27 Aug 2015 08:55:44 +0000 (08:55 +0000)]
am
29e3f766: (-s ours) am
607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
* commit '
29e3f766697c362e79b2d629812f9f17b1c559e0':
Svetoslav Ganov [Thu, 27 Aug 2015 08:55:31 +0000 (08:55 +0000)]
am
bb8bdd71: (-s ours) am
258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '
bb8bdd71683140558fa39718b43900758af9f7cd':
Tim Kilbourn [Thu, 27 Aug 2015 08:55:13 +0000 (08:55 +0000)]
am
99bad6f0: (-s ours) am
cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '
99bad6f0c7070127888bb2f37966ebe732d4c2d1':
Jason Monk [Thu, 27 Aug 2015 08:54:49 +0000 (08:54 +0000)]
am
dbb0f24c: (-s ours) am
157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '
dbb0f24cd0f62e4019edd1a474f295975bd7a1d2':
Julia Reynolds [Thu, 27 Aug 2015 08:54:19 +0000 (08:54 +0000)]
am
621b4870: (-s ours) am
c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
* commit '
621b48700365f5f93e5b9736b4a5508f235e7bac':
Jorim Jaggi [Thu, 27 Aug 2015 08:53:50 +0000 (08:53 +0000)]
am
09596431: (-s ours) am
1d071ce9: Make sure expandingFinished gets called when going into QS
* commit '
09596431d08fc275432d69a5b5738bcd42aa7428':
Kenny Root [Thu, 27 Aug 2015 08:53:33 +0000 (08:53 +0000)]
am
3b5b9c73: (-s ours) Merge branch \'mnc-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev-plus-aosp
* commit '
3b5b9c73d034dae25ec537edfbdea60f273d3c46':
Wenchao Tong [Thu, 27 Aug 2015 08:53:18 +0000 (08:53 +0000)]
am
1839b107: (-s ours) am
bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
* commit '
1839b107acb0a9432d80a3521fd54cc3c3c63e6a':
John Reck [Thu, 27 Aug 2015 08:53:05 +0000 (08:53 +0000)]
am
b9ce7374: (-s ours) am
2abf0f24: Fix a race condition that could cause lockup
* commit '
b9ce737499ceb9a1e9f1d66140fe842b8a8bcc45':
Amith Yamasani [Thu, 27 Aug 2015 08:52:46 +0000 (08:52 +0000)]
am
ba3aa080: (-s ours) am
b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '
ba3aa0808f2536ccde9171e2396cf68bf0833013':
Alex Klyubin [Thu, 27 Aug 2015 08:52:33 +0000 (08:52 +0000)]
am
85e0511b: (-s ours) am
304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit '
85e0511b5fee8c93a4e70f9a6a3975253b5dc2da':
Junda Liu [Thu, 27 Aug 2015 08:52:10 +0000 (08:52 +0000)]
am
59ae2da6: (-s ours) am
859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
* commit '
59ae2da69838daac8cc615733bb95626e8eeb268':
Jean-Michel Trivi [Thu, 27 Aug 2015 08:51:40 +0000 (08:51 +0000)]
am
9e4253f1: (-s ours) am
7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '
9e4253f144b60a6baedfcf411b320eb2fc48b5f1':
Jack Yu [Thu, 27 Aug 2015 08:51:05 +0000 (08:51 +0000)]
am
8c8c82d1: (-s ours) am
e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit '
8c8c82d15a1ad04313532be11cde6e9ede198c2a':
Geoff Mendal [Thu, 27 Aug 2015 08:50:39 +0000 (08:50 +0000)]
am
2a883052: (-s ours) am
13edc160: (-s ours) Import translations. DO NOT MERGE
* commit '
2a883052ded6872a42999a8d0bd1481cc4514897':
Nick Kralevich [Thu, 27 Aug 2015 08:50:31 +0000 (08:50 +0000)]
am
d1065992: (-s ours) am
06b93a48: Merge "Revert "UsbDeviceManager: fix b/
21429947 regression"" into mnc-dev
* commit '
d10659928a0821c8bcd899625b7985bf39b7e08a':
Svetoslav Ganov [Thu, 27 Aug 2015 08:50:23 +0000 (08:50 +0000)]
am
1d76cf00: (-s ours) am
492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev
* commit '
1d76cf00d9a946ad5354afc7a8c5ede5c44a3dcd':
Adam Lesinski [Thu, 27 Aug 2015 08:50:15 +0000 (08:50 +0000)]
am
93c0be91: (-s ours) am
f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev
* commit '
93c0be912c648c56b1a26c82eca6aa7bf2174d55':
Dianne Hackborn [Thu, 27 Aug 2015 08:50:07 +0000 (08:50 +0000)]
am
da56bea4: (-s ours) am
4a368659: Merge "Fix issue #
22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
* commit '
da56bea428f8e71fe8c0e23cb04c970fd8d39b99':
Adrian Roos [Thu, 27 Aug 2015 08:50:00 +0000 (08:50 +0000)]
am
a23076db: (-s ours) am
f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '
a23076db7d48a856fca111cce485f9f36ce2b9fd':
Dianne Hackborn [Thu, 27 Aug 2015 08:49:51 +0000 (08:49 +0000)]
am
aa0d9387: (-s ours) am
5507bb41: Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
* commit '
aa0d93873d6dcceca1a83112f2067da36479cab4':
Svetoslav Ganov [Thu, 27 Aug 2015 08:49:40 +0000 (08:49 +0000)]
am
4b4aceb5: (-s ours) am
41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit '
4b4aceb5a4d6186fd2c38ec884e96506fe0f2282':
Fyodor Kupolov [Thu, 27 Aug 2015 08:49:23 +0000 (08:49 +0000)]
am
522dd937: (-s ours) am
a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit '
522dd9373970e5ddcb0dc304113f5e752898c8bd':
Adam Lesinski [Thu, 27 Aug 2015 08:48:58 +0000 (08:48 +0000)]
am
4ddc598c: (-s ours) am
05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
* commit '
4ddc598c958d98038a961438d4de91342468df94':
Adrian Roos [Thu, 27 Aug 2015 08:48:33 +0000 (08:48 +0000)]
am
89173cef: (-s ours) am
7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
* commit '
89173cef093196b2030507439e279553f3ee4e11':
Jae Seo [Thu, 27 Aug 2015 08:48:17 +0000 (08:48 +0000)]
am
ffdc6a50: (-s ours) am
eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
* commit '
ffdc6a5018aa490414d2adffd2b2d87802b1d667':
Svetoslav Ganov [Thu, 27 Aug 2015 08:48:03 +0000 (08:48 +0000)]
am
7cd0c3a2: (-s ours) am
3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit '
7cd0c3a268fe1dcc0f5795b785265a313462df92':
John Reck [Thu, 27 Aug 2015 08:47:55 +0000 (08:47 +0000)]
am
a58966d2: (-s ours) am
3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
* commit '
a58966d2dadc8e4be52aaf00d8478f83a61423e7':
Adam Lesinski [Thu, 27 Aug 2015 08:47:46 +0000 (08:47 +0000)]
am
cac798a9: (-s ours) am
6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '
cac798a91893279390f2fcf49a19cd858cc35f82':
Nick Kralevich [Thu, 27 Aug 2015 08:47:38 +0000 (08:47 +0000)]
am
1f2a5665: (-s ours) am
3b0bbd7b: Merge "UsbDeviceManager: fix b/
21429947 regression" into mnc-dev
* commit '
1f2a56659faea64d2b417a17c6842726e44e4a85':
Chris Wren [Thu, 27 Aug 2015 08:47:29 +0000 (08:47 +0000)]
am
7888a1bf: (-s ours) am
db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
* commit '
7888a1bfda8b7c8bdf98f84644ce3965963c321c':
Tim Kilbourn [Thu, 27 Aug 2015 08:47:17 +0000 (08:47 +0000)]
am
c7229fb1: (-s ours) am
1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
* commit '
c7229fb1e0e386a828c640212da799afa5c8eb57':
Alan Viverette [Thu, 27 Aug 2015 08:46:59 +0000 (08:46 +0000)]
am
803e7512: (-s ours) am
9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
* commit '
803e75126b38541437c534025e58a2c03ddf26c9':
Fyodor Kupolov [Thu, 27 Aug 2015 08:46:16 +0000 (08:46 +0000)]
am
56bfa513: (-s ours) am
5ef70b02: Merge "Added a note about location permission" into mnc-dev
* commit '
56bfa51363a4b55b02ee22c301294a6ee0361b62':
xin He [Thu, 27 Aug 2015 08:45:31 +0000 (08:45 +0000)]
am
89b9831c: (-s ours) am
15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
* commit '
89b9831ce26fec5f56fd514ba37d267fc050d567':
Jeff Sharkey [Thu, 27 Aug 2015 08:44:55 +0000 (08:44 +0000)]
am
e5a0e176: (-s ours) am
f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit '
e5a0e1766741229750bfb5f74a06b2d34f071a7a':
Jason Monk [Thu, 27 Aug 2015 08:44:32 +0000 (08:44 +0000)]
am
5669e403: (-s ours) am
4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit '
5669e4035d5dc722b5281d3914df479a5dee2f91':
Jorim Jaggi [Thu, 27 Aug 2015 08:44:19 +0000 (08:44 +0000)]
am
e9fdda68: (-s ours) am
ac73f1ef: Partially fix that beginning of animation is skipped
* commit '
e9fdda68e8c694f61507dae10936fcb44fa0adfe':
Dianne Hackborn [Thu, 27 Aug 2015 08:44:02 +0000 (08:44 +0000)]
am
eaf3de13: (-s ours) am
6f64e737: Merge "Fix issue #
22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
* commit '
eaf3de13ffc7f73ce0634a5b0f3675c57798cf62':
Elliott Hughes [Thu, 27 Aug 2015 08:43:43 +0000 (08:43 +0000)]
am
0817e208: (-s ours) am
f9a82218: am
86d5fc28: Merge "aapt: expat exports its header files now."
* commit '
0817e208673813537895914ae7a5a2c1c0119974':
Fred Chung [Thu, 27 Aug 2015 08:43:16 +0000 (08:43 +0000)]
am
f60ecd44: (-s ours) am
db71828c: am
2c3b9fb8: am
3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
* commit '
f60ecd44137251ee1143437017f66410f756cfab':
Dianne Hackborn [Thu, 27 Aug 2015 08:42:35 +0000 (08:42 +0000)]
am
dd400d6a: (-s ours) am
b7394671: Merge "Work on issue #
22303510: Additional permissions aren\'t properly..." into mnc-dev
* commit '
dd400d6a5405be61172c451ead98535d8dc70762':
Alex Klyubin [Thu, 27 Aug 2015 08:41:40 +0000 (08:41 +0000)]
am
f6093833: (-s ours) am
ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev
* commit '
f6093833148f19387633e92a00e33b69d6ca9f15':
Wale Ogunwale [Thu, 27 Aug 2015 08:41:08 +0000 (08:41 +0000)]
am
5e92327d: (-s ours) am
ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
* commit '
5e92327deb95d9f8d8333519afa2c3b772592671':
Kenny Guy [Thu, 27 Aug 2015 08:40:45 +0000 (08:40 +0000)]
am
8ea8c98a: (-s ours) am
2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit '
8ea8c98a1f491ac0d30d9024a48561690cfd4127':
Jason Monk [Thu, 27 Aug 2015 08:40:25 +0000 (08:40 +0000)]
am
350edb81: (-s ours) am
41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev
* commit '
350edb81bf59741b21ac8a196f22fd9f3efd5f5c':
Jason Monk [Thu, 27 Aug 2015 08:39:59 +0000 (08:39 +0000)]
am
6fbfcbaf: (-s ours) am
a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev
* commit '
6fbfcbaf9d09ba555c6b893f509881a4b91d28bc':
Jim Miller [Thu, 27 Aug 2015 08:39:22 +0000 (08:39 +0000)]
am
cd081547: (-s ours) am
091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes.
* commit '
cd081547ef1214ec694605f984ab8f47a19a6d70':
Svetoslav Ganov [Thu, 27 Aug 2015 08:38:44 +0000 (08:38 +0000)]
am
d7a3e7b3: (-s ours) am
bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev
* commit '
d7a3e7b330f389fd3ea46366dc3d756af8f9db38':
George Mount [Thu, 27 Aug 2015 08:38:24 +0000 (08:38 +0000)]
am
246ede1b: (-s ours) am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
246ede1b9c66647bd6e2a02be2f2004a8295f6fb':
Jorim Jaggi [Thu, 27 Aug 2015 08:38:06 +0000 (08:38 +0000)]
am
3bda57a0: (-s ours) am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
3bda57a05f00cb3cfe5efdb697716f097b5cf510':
Jorim Jaggi [Thu, 27 Aug 2015 08:37:50 +0000 (08:37 +0000)]
am
7840c0a0: (-s ours) am
c1244a29: Merge "Touch, wake and unlock" into mnc-dev
* commit '
7840c0a071c6cff891b781e5bfecc190880ad0c6':
Jeff Sharkey [Thu, 27 Aug 2015 08:37:36 +0000 (08:37 +0000)]
am
71395ee8: (-s ours) am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
71395ee8efaddaf2c279e88bd6d22acba8f1f769':
John Reck [Thu, 27 Aug 2015 08:37:22 +0000 (08:37 +0000)]
am
0ccb23e4: (-s ours) am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
0ccb23e4befacf9d4430f3c8c52b81010705ad93':
Fyodor Kupolov [Thu, 27 Aug 2015 08:37:03 +0000 (08:37 +0000)]
am
4dee174f: (-s ours) am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
4dee174f7228bd1ba38f3834c42aa8efb52e02b5':
Elliott Hughes [Thu, 27 Aug 2015 08:36:34 +0000 (08:36 +0000)]
am
1de146ac: (-s ours) Merge "aapt: expat exports its header files now." into mnc-dev-plus-aosp
* commit '
1de146ac4ff0ef0c042f1db2d42ff2961812ae9b':
aapt: expat exports its header files now.
Amith Yamasani [Thu, 27 Aug 2015 08:36:04 +0000 (08:36 +0000)]
am
3bdc0940: (-s ours) am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
3bdc094014db12fecdfe7158ff7523cebaa99d29':
Alex Klyubin [Thu, 27 Aug 2015 08:35:45 +0000 (08:35 +0000)]
am
dc90c5c3: (-s ours) am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
dc90c5c3358768df071455159f1400ffaa676951':
Adam Lesinski [Thu, 27 Aug 2015 08:35:29 +0000 (08:35 +0000)]
am
bbd86a4b: (-s ours) am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
bbd86a4b2bed678f1731207917be1fc2304c7370':
Christopher Tate [Thu, 27 Aug 2015 08:35:15 +0000 (08:35 +0000)]
am
9b76ff87: (-s ours) am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
9b76ff878362af2fc9f3709e67cd2f0f163cae0b':
Svetoslav [Thu, 27 Aug 2015 08:35:02 +0000 (08:35 +0000)]
am
69ac7236: (-s ours) am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
69ac7236b3dc08f38d6b77eb043f839f3d23a926':
Todd Kennedy [Thu, 27 Aug 2015 08:34:48 +0000 (08:34 +0000)]
am
5ec1e244: (-s ours) am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
5ec1e24469a5847ba3bbdae1770af61385a85020':
Nick Kralevich [Thu, 27 Aug 2015 08:34:26 +0000 (08:34 +0000)]
am
38be0566: (-s ours) am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
38be0566bcd3c2d7804ce504c9bd2dbca444f953':
Raph Levien [Thu, 27 Aug 2015 08:34:01 +0000 (08:34 +0000)]
am
06e38064: (-s ours) am
1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
* commit '
06e380644e6dc9c9d39e596d1a4e0de5180194e2':
Diego Perez [Thu, 27 Aug 2015 08:33:33 +0000 (08:33 +0000)]
am
5e0ac877: (-s ours) am
66e66831: Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
* commit '
5e0ac8774f8814b4cf98b3abde6c11f02f3ab047':
Wale Ogunwale [Thu, 27 Aug 2015 08:33:08 +0000 (08:33 +0000)]
am
95b37306: (-s ours) am
e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
* commit '
95b37306c051c7736d3cdbe1247f0b6f2c0be749':
Miao Wang [Thu, 27 Aug 2015 08:32:50 +0000 (08:32 +0000)]
am
a862d703: (-s ours) am
ef3ca9f3: am
37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop bug."
* commit '
a862d703ce468da00dcc5bad72583b022fcfea9a':
Jae Seo [Thu, 27 Aug 2015 08:32:43 +0000 (08:32 +0000)]
am
efdadd4f: (-s ours) am
b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
* commit '
efdadd4f99ab494ccc60e295664bd08f63b45fdd':
Terry Heo [Thu, 27 Aug 2015 08:32:34 +0000 (08:32 +0000)]
am
81c68d7e: (-s ours) am
e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
* commit '
81c68d7e5076e2f4700047c3a7daf89dc6fbbce3':
Dongwon Kang [Thu, 27 Aug 2015 08:32:26 +0000 (08:32 +0000)]
am
dd824715: (-s ours) am
6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
* commit '
dd8247159805eda04bfb5fde474a277bae972973':
Jorim Jaggi [Thu, 27 Aug 2015 08:32:18 +0000 (08:32 +0000)]
am
1bc43302: (-s ours) am
55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
* commit '
1bc4330209ba4ce7ac3652bf5dd6c0bc56424794':
Jorim Jaggi [Thu, 27 Aug 2015 08:32:02 +0000 (08:32 +0000)]
am
21660515: (-s ours) am
1f98c62f: Fix unnecessary layer creation for appear animation
* commit '
21660515b0f4e0485c8a5357184d91271b280b68':
Miao Wang [Thu, 27 Aug 2015 08:31:54 +0000 (08:31 +0000)]
am
3fd9bf4e: (-s ours) am
15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
* commit '
3fd9bf4e244b9df2039b7323ef3da9944c292d76':
Jorim Jaggi [Thu, 27 Aug 2015 08:31:40 +0000 (08:31 +0000)]
am
8f3333a9: (-s ours) am
4cd72169: Fix window animation flickering
* commit '
8f3333a9edb15a344431a068044022dd774379f5':
Jorim Jaggi [Thu, 27 Aug 2015 08:31:17 +0000 (08:31 +0000)]
am
478e762b: (-s ours) am
8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
* commit '
478e762b46f509aa8a4476829eeaf4528fb3d52f':
Alan Viverette [Thu, 27 Aug 2015 08:30:57 +0000 (08:30 +0000)]
am
a382bb5c: (-s ours) am
41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
* commit '
a382bb5c35f01c7c329e034359296a03152595c3':
Alan Viverette [Thu, 27 Aug 2015 08:30:37 +0000 (08:30 +0000)]
am
7e793193: (-s ours) am
001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
* commit '
7e79319308bb485a875f2a0c3a4a8bdf520a077d':
Simranjit Singh Kohli [Thu, 27 Aug 2015 08:30:26 +0000 (08:30 +0000)]
am
7aebe5e1: (-s ours) am
02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it
* commit '
7aebe5e17c2d912f9e8a065fa1acd920feff81e8':
Dianne Hackborn [Thu, 27 Aug 2015 08:30:16 +0000 (08:30 +0000)]
am
ac00dd8b: (-s ours) am
a7ce2344: Merge "Fix issue #
22564918: Request is inactive" into mnc-dev
* commit '
ac00dd8b363634277932b54ab7fd9ac0983863fc':
Jorim Jaggi [Thu, 27 Aug 2015 08:30:05 +0000 (08:30 +0000)]
am
76a6cb6d: (-s ours) am
86b273f1: Fix jank in swipe-up to unlock
* commit '
76a6cb6d2abe50e7f01464036d0fe2cafd691f15':
Jorim Jaggi [Thu, 27 Aug 2015 08:29:54 +0000 (08:29 +0000)]
am
bb816d9e: (-s ours) am
f8763581: Allow navigation bar drawing during window animations
* commit '
bb816d9e7d304082ed1d6ee9db9eceeba260c721':
Roozbeh Pournader [Thu, 27 Aug 2015 08:29:47 +0000 (08:29 +0000)]
am
96f75efa: (-s ours) am
2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
* commit '
96f75efa9ff2208fbf979df651ca78d2479d6612':
Keisuke Kuroyanagi [Thu, 27 Aug 2015 08:29:34 +0000 (08:29 +0000)]
am
e97602ac: (-s ours) am
437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
* commit '
e97602ac2f864d9f1c6ace9e3fec845b507c3e26':
OSDN Git Service
