OSDN Git Service
Adrian Roos [Thu, 27 Aug 2015 18:27:34 +0000 (18:27 +0000)]
am
462ec104: am
30a03425: (-s ours) am
0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit '
462ec1042f4755db6cb40d32b27a513912c1f56b':
Svetoslav Ganov [Thu, 27 Aug 2015 18:27:22 +0000 (18:27 +0000)]
am
bc283876: am
056b71c0: (-s ours) am
28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
* commit '
bc28387690fbe061edbe2a6dc3aac6f2dc581df4':
John Reck [Thu, 27 Aug 2015 18:27:09 +0000 (18:27 +0000)]
am
272958b3: am
1f4b21b9: (-s ours) am
8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '
272958b33b5d095b2c08bdd23b3a74b833763bf2':
Deepanshu Gupta [Thu, 27 Aug 2015 18:26:54 +0000 (18:26 +0000)]
am
708d8b1f: am
fe4ff64a: (-s ours) am
f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
* commit '
708d8b1f7eaa87b17dace4e9be407f60ba3700ab':
Yohei Yukawa [Thu, 27 Aug 2015 18:26:28 +0000 (18:26 +0000)]
am
2db6f494: am
0e235f47: (-s ours) am
0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
* commit '
2db6f4944a4aaaf4a84921ae10f9669dd2d45ac5':
Deepanshu Gupta [Thu, 27 Aug 2015 18:25:59 +0000 (18:25 +0000)]
am
35fe7782: am
b8719e27: (-s ours) am
49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev
* commit '
35fe7782d7c58b5d233458e3002c1ac808025161':
Deepanshu Gupta [Thu, 27 Aug 2015 18:25:23 +0000 (18:25 +0000)]
am
e7146229: am
a6d25c84: (-s ours) am
f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
* commit '
e714622931cf08d566e3cd690f39d5332a7c4fed':
Stephen Hines [Thu, 27 Aug 2015 18:24:47 +0000 (18:24 +0000)]
am
9d3bff55: am
b3a1674a: (-s ours) am
ed3ffe0f: am
6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
* commit '
9d3bff55b54ed99f7f8c29c713070d9137542f98':
Tim Kilbourn [Thu, 27 Aug 2015 18:24:17 +0000 (18:24 +0000)]
am
88bacc05: am
43250dd3: (-s ours) am
a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit '
88bacc05671da5079f14492593afb6bd17f01adb':
Svetoslav Ganov [Thu, 27 Aug 2015 18:23:49 +0000 (18:23 +0000)]
am
bb9c060f: am
29e3f766: (-s ours) am
607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
* commit '
bb9c060f5ef9dc0ca2e6c225d10c0c5f00651c39':
Svetoslav Ganov [Thu, 27 Aug 2015 18:23:23 +0000 (18:23 +0000)]
am
756f91e2: am
bb8bdd71: (-s ours) am
258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '
756f91e229dd110e6639b51fb23ceede5e840642':
Tim Kilbourn [Thu, 27 Aug 2015 18:22:51 +0000 (18:22 +0000)]
am
8ac9451e: am
99bad6f0: (-s ours) am
cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '
8ac9451ec0593d160bacc31ea7fbfce8e0aac8eb':
Jason Monk [Thu, 27 Aug 2015 18:22:26 +0000 (18:22 +0000)]
am
bd45e79c: am
dbb0f24c: (-s ours) am
157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '
bd45e79c70eacf363e11069f71040923a0171da8':
Julia Reynolds [Thu, 27 Aug 2015 18:22:01 +0000 (18:22 +0000)]
am
2ca349c0: am
621b4870: (-s ours) am
c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
* commit '
2ca349c0f001d00a656cb5b59406d3cfdcaa5464':
Jorim Jaggi [Thu, 27 Aug 2015 18:21:23 +0000 (18:21 +0000)]
am
db77a90b: am
09596431: (-s ours) am
1d071ce9: Make sure expandingFinished gets called when going into QS
* commit '
db77a90bf8d3afa1d7672ca46ebdecc163fd7465':
Kenny Root [Thu, 27 Aug 2015 18:21:03 +0000 (18:21 +0000)]
am
9a2a1a39: 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 '
9a2a1a39e826d2a2472e76da86060efbd5b22cd6':
Wenchao Tong [Thu, 27 Aug 2015 18:20:27 +0000 (18:20 +0000)]
am
614e9457: am
1839b107: (-s ours) am
bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
* commit '
614e94572048a265adc3d4d90e5b33319ca99604':
John Reck [Thu, 27 Aug 2015 18:19:51 +0000 (18:19 +0000)]
am
ccef1550: am
b9ce7374: (-s ours) am
2abf0f24: Fix a race condition that could cause lockup
* commit '
ccef15506802c9812836fdab384cf3cc5a68f2bf':
Amith Yamasani [Thu, 27 Aug 2015 18:19:12 +0000 (18:19 +0000)]
am
eceae9cb: am
ba3aa080: (-s ours) am
b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '
eceae9cb8ec15297c4228822834efb0aa35c29a2':
Alex Klyubin [Thu, 27 Aug 2015 18:18:36 +0000 (18:18 +0000)]
am
bdb1902b: am
85e0511b: (-s ours) am
304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit '
bdb1902b1d3168cdb3589785fb684f1b8ae371e5':
Junda Liu [Thu, 27 Aug 2015 18:18:21 +0000 (18:18 +0000)]
am
be0fbe36: am
59ae2da6: (-s ours) am
859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
* commit '
be0fbe3683347e4a38030a349f6083e5419d5664':
Jean-Michel Trivi [Thu, 27 Aug 2015 18:18:08 +0000 (18:18 +0000)]
am
1e140971: am
9e4253f1: (-s ours) am
7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '
1e140971c7be07e406f871d75136f86c9ee2447e':
Jack Yu [Thu, 27 Aug 2015 18:17:52 +0000 (18:17 +0000)]
am
d6d5b46f: am
8c8c82d1: (-s ours) am
e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit '
d6d5b46f083ff7523b1b383d0e0e3101b1b702ab':
Geoff Mendal [Thu, 27 Aug 2015 18:17:36 +0000 (18:17 +0000)]
am
872c6a92: (-s ours) am
2a883052: (-s ours) am
13edc160: (-s ours) Import translations. DO NOT MERGE
* commit '
872c6a922da20ccc55cf9e8ebfef20a1bb3c74cf':
Nick Kralevich [Thu, 27 Aug 2015 18:17:17 +0000 (18:17 +0000)]
am
988273b1: am
d1065992: (-s ours) am
06b93a48: Merge "Revert "UsbDeviceManager: fix b/
21429947 regression"" into mnc-dev
* commit '
988273b1edb80370075af9fdd3f76a36df7677ad':
Svetoslav Ganov [Thu, 27 Aug 2015 18:16:47 +0000 (18:16 +0000)]
am
accd0323: am
1d76cf00: (-s ours) am
492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev
* commit '
accd0323a54c98e38bbbc06a8b4443a4bd683390':
Adam Lesinski [Thu, 27 Aug 2015 18:16:18 +0000 (18:16 +0000)]
am
cafe4532: am
93c0be91: (-s ours) am
f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev
* commit '
cafe45320d504657fa4daa08f5f3a1e2849a6dd7':
Dianne Hackborn [Thu, 27 Aug 2015 18:16:02 +0000 (18:16 +0000)]
am
fcecc4e9: am
da56bea4: (-s ours) am
4a368659: Merge "Fix issue #
22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
* commit '
fcecc4e95fbbd8a35938ad3c752d104b9dac4872':
Adrian Roos [Thu, 27 Aug 2015 18:15:48 +0000 (18:15 +0000)]
am
03e24899: am
a23076db: (-s ours) am
f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '
03e24899fba5b55ee920ae70640a49e3296a99a8':
Dianne Hackborn [Thu, 27 Aug 2015 18:15:36 +0000 (18:15 +0000)]
am
2a899c1c: am
aa0d9387: (-s ours) am
5507bb41: Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
* commit '
2a899c1c5bba1edd717957860abf5ee3c17f0856':
Svetoslav Ganov [Thu, 27 Aug 2015 18:15:21 +0000 (18:15 +0000)]
am
72ac7f3b: am
4b4aceb5: (-s ours) am
41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit '
72ac7f3b972bd4fbd42f06a04ed3367edaf54149':
Fyodor Kupolov [Thu, 27 Aug 2015 18:15:05 +0000 (18:15 +0000)]
am
f6e847b5: am
522dd937: (-s ours) am
a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit '
f6e847b502be1ddc78f52ece99052fce4145d7c3':
Adam Lesinski [Thu, 27 Aug 2015 18:14:47 +0000 (18:14 +0000)]
am
5c1f7290: am
4ddc598c: (-s ours) am
05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
* commit '
5c1f7290a9eb31d4316f5f24791be002ca54f331':
Adrian Roos [Thu, 27 Aug 2015 18:14:17 +0000 (18:14 +0000)]
am
2b6a28e5: am
89173cef: (-s ours) am
7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
* commit '
2b6a28e592e2d9217192b9572e0a1a4bdfd1bece':
Jae Seo [Thu, 27 Aug 2015 18:13:58 +0000 (18:13 +0000)]
am
af86173d: am
ffdc6a50: (-s ours) am
eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
* commit '
af86173d508c63818eed357083f768be2848d337':
Svetoslav Ganov [Thu, 27 Aug 2015 18:13:44 +0000 (18:13 +0000)]
am
f8c6e203: am
7cd0c3a2: (-s ours) am
3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit '
f8c6e203956dae0ccab618ac478bb1d23d964524':
John Reck [Thu, 27 Aug 2015 18:13:31 +0000 (18:13 +0000)]
am
7df89722: am
a58966d2: (-s ours) am
3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
* commit '
7df89722421cf5a954065e9aee7fb3c1ab03c1ee':
Adam Lesinski [Thu, 27 Aug 2015 18:13:18 +0000 (18:13 +0000)]
am
2a79ed9a: am
cac798a9: (-s ours) am
6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '
2a79ed9a587eac85b864ffc8980ba852d89e5bae':
Nick Kralevich [Thu, 27 Aug 2015 18:13:04 +0000 (18:13 +0000)]
am
df98cd73: am
1f2a5665: (-s ours) am
3b0bbd7b: Merge "UsbDeviceManager: fix b/
21429947 regression" into mnc-dev
* commit '
df98cd730e2b982c2aa1b68f68e851406688132a':
Chris Wren [Thu, 27 Aug 2015 18:12:52 +0000 (18:12 +0000)]
am
b86a311b: am
7888a1bf: (-s ours) am
db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
* commit '
b86a311b99a3c2913c5a9e4a2cc9f5e29b78cc02':
Tim Kilbourn [Thu, 27 Aug 2015 18:12:45 +0000 (18:12 +0000)]
am
06d07d7f: am
c7229fb1: (-s ours) am
1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
* commit '
06d07d7f0aa334fac67ab35cee6e5083d8525c06':
Alan Viverette [Thu, 27 Aug 2015 18:12:36 +0000 (18:12 +0000)]
am
596ff43a: am
803e7512: (-s ours) am
9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
* commit '
596ff43ac6b2b52804cdc4ed72dd37138cdbb6c2':
Fyodor Kupolov [Thu, 27 Aug 2015 18:12:28 +0000 (18:12 +0000)]
am
d86f36da: am
56bfa513: (-s ours) am
5ef70b02: Merge "Added a note about location permission" into mnc-dev
* commit '
d86f36da1f3c23e0a59855a727fc05d4cb74d5fb':
xin He [Thu, 27 Aug 2015 18:12:21 +0000 (18:12 +0000)]
am
a09b5b10: am
89b9831c: (-s ours) am
15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
* commit '
a09b5b10c1a7a50e30b65153eba20d69b483a1a9':
Jeff Sharkey [Thu, 27 Aug 2015 18:12:13 +0000 (18:12 +0000)]
am
f154d62b: am
e5a0e176: (-s ours) am
f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit '
f154d62b12626fdfafb7bcbde9638ea940d6d8cd':
Jason Monk [Thu, 27 Aug 2015 18:12:03 +0000 (18:12 +0000)]
am
2bcc93c5: am
5669e403: (-s ours) am
4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit '
2bcc93c5914b371fe0f85a1d6b7b24dc8697fda2':
Jorim Jaggi [Thu, 27 Aug 2015 18:11:56 +0000 (18:11 +0000)]
am
e13dfd24: am
e9fdda68: (-s ours) am
ac73f1ef: Partially fix that beginning of animation is skipped
* commit '
e13dfd244764000263a5c4807b5a8705081d8419':
Dianne Hackborn [Thu, 27 Aug 2015 18:11:48 +0000 (18:11 +0000)]
am
229ffe0c: am
eaf3de13: (-s ours) am
6f64e737: Merge "Fix issue #
22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
* commit '
229ffe0c24f0237392d6366a1cae34e932e8dca7':
Elliott Hughes [Thu, 27 Aug 2015 18:11:39 +0000 (18:11 +0000)]
am
bac3cb84: am
0817e208: (-s ours) am
f9a82218: am
86d5fc28: Merge "aapt: expat exports its header files now."
* commit '
bac3cb84b83753ed7a048a4935dd5dad19977cc6':
Fred Chung [Thu, 27 Aug 2015 18:11:22 +0000 (18:11 +0000)]
am
86f8dfc0: 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 '
86f8dfc02fbdc6a8ddc4e4be68f49008e5f6317a':
Dianne Hackborn [Thu, 27 Aug 2015 18:11:08 +0000 (18:11 +0000)]
am
a10df1a8: am
dd400d6a: (-s ours) am
b7394671: Merge "Work on issue #
22303510: Additional permissions aren\'t properly..." into mnc-dev
* commit '
a10df1a86806b51a063a76199f1793a641b192e7':
Alex Klyubin [Thu, 27 Aug 2015 18:11:00 +0000 (18:11 +0000)]
am
1da16420: am
f6093833: (-s ours) am
ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev
* commit '
1da16420c2af9f591385c4de5a3a1bac955991f7':
Wale Ogunwale [Thu, 27 Aug 2015 18:10:45 +0000 (18:10 +0000)]
am
a6059006: am
5e92327d: (-s ours) am
ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
* commit '
a6059006c69147183f9b5c001d89c1c793dfb769':
Kenny Guy [Thu, 27 Aug 2015 18:10:31 +0000 (18:10 +0000)]
am
c22f697b: am
8ea8c98a: (-s ours) am
2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit '
c22f697bae17a82ceba9c9111afe35e5cd9b8e14':
Jason Monk [Thu, 27 Aug 2015 18:10:18 +0000 (18:10 +0000)]
am
2be2d106: am
350edb81: (-s ours) am
41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev
* commit '
2be2d106cff049b76978a72115a83dc1dc6d8d67':
Jason Monk [Thu, 27 Aug 2015 18:10:07 +0000 (18:10 +0000)]
am
2abe683b: am
6fbfcbaf: (-s ours) am
a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev
* commit '
2abe683bd211bc4d2d281de9fe6bcd6be4ac5607':
Jim Miller [Thu, 27 Aug 2015 18:09:52 +0000 (18:09 +0000)]
am
28ffd67e: am
cd081547: (-s ours) am
091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes.
* commit '
28ffd67e187b4f9f9de79b7225ccd3e034c8e8fd':
Svetoslav Ganov [Thu, 27 Aug 2015 18:09:30 +0000 (18:09 +0000)]
am
be0a6fb2: am
d7a3e7b3: (-s ours) am
bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev
* commit '
be0a6fb28e4fa40d4a8e84e70fb51d7eaa7fd108':
George Mount [Thu, 27 Aug 2015 18:09:08 +0000 (18:09 +0000)]
am
8f2a2cf0: am
246ede1b: (-s ours) am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
8f2a2cf0f292925661c1b49178e9ee6e6e49433a':
Jorim Jaggi [Thu, 27 Aug 2015 18:08:21 +0000 (18:08 +0000)]
am
d3144f0a: am
3bda57a0: (-s ours) am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
d3144f0a4252cf211bf84242242158749837eae6':
Jorim Jaggi [Thu, 27 Aug 2015 18:07:43 +0000 (18:07 +0000)]
am
a46c4edb: am
7840c0a0: (-s ours) am
c1244a29: Merge "Touch, wake and unlock" into mnc-dev
* commit '
a46c4edb57b2909bcb4749e94448bf7e35e2db90':
Jeff Sharkey [Thu, 27 Aug 2015 18:07:23 +0000 (18:07 +0000)]
am
6b2f74df: am
71395ee8: (-s ours) am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
6b2f74df82cd137f5217cf4849f2f2f276710c7d':
John Reck [Thu, 27 Aug 2015 18:07:11 +0000 (18:07 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
John Reck [Thu, 27 Aug 2015 18:06:57 +0000 (18:06 +0000)]
am
65fb5834: am
0ccb23e4: (-s ours) am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
65fb58345d022234af85880f35875601d124a4e6':
Fyodor Kupolov [Thu, 27 Aug 2015 18:06:25 +0000 (18:06 +0000)]
am
c21ff5de: am
4dee174f: (-s ours) am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
c21ff5de569414fe54068a211cf1495e3bbe2446':
Elliott Hughes [Thu, 27 Aug 2015 18:05:46 +0000 (18:05 +0000)]
am
4f0809da: am
1de146ac: (-s ours) Merge "aapt: expat exports its header files now." into mnc-dev-plus-aosp
* commit '
4f0809da2c83c47b46f2ca4b2299f86bb4c45c98':
aapt: expat exports its header files now.
Xiaohui Chen [Wed, 26 Aug 2015 21:54:34 +0000 (14:54 -0700)]
More cleanup USER_OWNER
Bug:
19913735
Change-Id: I7fe1bb2a66231b7d1ae0670dff5e2ec736b2e541
Amith Yamasani [Thu, 27 Aug 2015 18:05:01 +0000 (18:05 +0000)]
am
69e2958e: am
3bdc0940: (-s ours) am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
69e2958eb4e4caff7a0799861e013c7482674033':
Alex Klyubin [Thu, 27 Aug 2015 18:04:30 +0000 (18:04 +0000)]
am
81e492f5: am
dc90c5c3: (-s ours) am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
81e492f5745920e7f67c81af17dca5dd5eb40be1':
Adam Lesinski [Thu, 27 Aug 2015 18:04:12 +0000 (18:04 +0000)]
am
6dfb0d44: am
bbd86a4b: (-s ours) am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
6dfb0d44f4126a4867b3a2ba07d12e32c80ff9ff':
Christopher Tate [Thu, 27 Aug 2015 18:03:40 +0000 (18:03 +0000)]
am
3e504001: am
9b76ff87: (-s ours) am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
3e5040013766f46e826bcc881a79b80867f7f9b2':
Svetoslav [Thu, 27 Aug 2015 18:02:48 +0000 (18:02 +0000)]
am
6a0e9c80: am
69ac7236: (-s ours) am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
6a0e9c80b9398ca2035a35f23e32091e2387d801':
Todd Kennedy [Thu, 27 Aug 2015 18:02:05 +0000 (18:02 +0000)]
am
ce042f68: am
5ec1e244: (-s ours) am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
ce042f687d7d42c6689d3896c1bef146a5c42fbd':
Nick Kralevich [Thu, 27 Aug 2015 18:01:51 +0000 (18:01 +0000)]
am
07aa9ca3: am
38be0566: (-s ours) am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
07aa9ca39473ab86a6817564cdb4e587963cf6ab':
Raph Levien [Thu, 27 Aug 2015 18:01:38 +0000 (18:01 +0000)]
am
9625561b: am
06e38064: (-s ours) am
1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
* commit '
9625561b1d0ae4365a7540ee8246466173069feb':
Diego Perez [Thu, 27 Aug 2015 18:01:23 +0000 (18:01 +0000)]
am
cf21fef9: am
5e0ac877: (-s ours) am
66e66831: Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
* commit '
cf21fef9715de83b48c99d864c8d7feebd199605':
Wale Ogunwale [Thu, 27 Aug 2015 18:01:10 +0000 (18:01 +0000)]
am
605dea8e: am
95b37306: (-s ours) am
e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
* commit '
605dea8e6a043d3db03431e3a7edf05d273d4702':
Miao Wang [Thu, 27 Aug 2015 18:00:51 +0000 (18:00 +0000)]
am
10e01930: am
a862d703: (-s ours) am
ef3ca9f3: am
37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop bug."
* commit '
10e019306e280a973e711e5ac545665ffd4d52cd':
Jae Seo [Thu, 27 Aug 2015 18:00:23 +0000 (18:00 +0000)]
am
051fbf2d: am
efdadd4f: (-s ours) am
b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
* commit '
051fbf2d8f5470c0b2f2ec8065e7d93e30ef0a69':
Terry Heo [Thu, 27 Aug 2015 17:59:51 +0000 (17:59 +0000)]
am
6eac9148: am
81c68d7e: (-s ours) am
e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
* commit '
6eac914827054580c9dc6197723d1b6fe2697f4f':
Dongwon Kang [Thu, 27 Aug 2015 17:59:20 +0000 (17:59 +0000)]
am
ed3eedea: am
dd824715: (-s ours) am
6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
* commit '
ed3eedea6414dc6476d7318a258ddabc190c9596':
Jorim Jaggi [Thu, 27 Aug 2015 17:58:59 +0000 (17:58 +0000)]
am
9aa6f825: am
1bc43302: (-s ours) am
55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
* commit '
9aa6f825f028e597591b019821bc9b5093eda5c6':
Jorim Jaggi [Thu, 27 Aug 2015 17:58:46 +0000 (17:58 +0000)]
am
0c8846e5: am
21660515: (-s ours) am
1f98c62f: Fix unnecessary layer creation for appear animation
* commit '
0c8846e55a435581249d330fde5af127a9820f78':
Miao Wang [Thu, 27 Aug 2015 17:58:33 +0000 (17:58 +0000)]
am
9fbc8cec: am
3fd9bf4e: (-s ours) am
15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
* commit '
9fbc8cecc52da254f93a1294a5b5a3ce3b71c5e7':
Jorim Jaggi [Thu, 27 Aug 2015 17:58:20 +0000 (17:58 +0000)]
am
2bedb6fd: am
8f3333a9: (-s ours) am
4cd72169: Fix window animation flickering
* commit '
2bedb6fdbf1aabcfcf55ac361d60be9f16761600':
Jorim Jaggi [Thu, 27 Aug 2015 17:58:02 +0000 (17:58 +0000)]
am
eecf1188: am
478e762b: (-s ours) am
8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
* commit '
eecf118876cfd0339a0b6eb3219902f56c139200':
Alan Viverette [Thu, 27 Aug 2015 17:57:37 +0000 (17:57 +0000)]
am
00b022bc: am
a382bb5c: (-s ours) am
41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
* commit '
00b022bc140c848098d7f6954e9a6560f8cfee1c':
Alan Viverette [Thu, 27 Aug 2015 17:57:08 +0000 (17:57 +0000)]
am
6a901d9b: am
7e793193: (-s ours) am
001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
* commit '
6a901d9bc7ef6d195eb45164f7063db60bfdc286':
Simranjit Singh Kohli [Thu, 27 Aug 2015 17:56:50 +0000 (17:56 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Simranjit Singh Kohli [Thu, 27 Aug 2015 17:56:34 +0000 (17:56 +0000)]
am
77cae522: 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 s
* commit '
77cae5225f2795b2a5379cb76f360bcc4624b959':
Dianne Hackborn [Thu, 27 Aug 2015 17:56:18 +0000 (17:56 +0000)]
am
6a3ec888: am
ac00dd8b: (-s ours) am
a7ce2344: Merge "Fix issue #
22564918: Request is inactive" into mnc-dev
* commit '
6a3ec888bae0bbb9827a709b6a120aeb4363205c':
Jorim Jaggi [Thu, 27 Aug 2015 17:56:10 +0000 (17:56 +0000)]
am
ba32d9d3: am
76a6cb6d: (-s ours) am
86b273f1: Fix jank in swipe-up to unlock
* commit '
ba32d9d3c8955180f38ecf41e81d471f76460166':
Jorim Jaggi [Thu, 27 Aug 2015 17:56:02 +0000 (17:56 +0000)]
am
3318a272: am
bb816d9e: (-s ours) am
f8763581: Allow navigation bar drawing during window animations
* commit '
3318a27266f55e96127a96839a85f5bb51ff499a':
Roozbeh Pournader [Thu, 27 Aug 2015 17:55:54 +0000 (17:55 +0000)]
am
084d3f81: am
96f75efa: (-s ours) am
2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
* commit '
084d3f81ec6fc60045cec96ad52c5034c3323006':
Keisuke Kuroyanagi [Thu, 27 Aug 2015 17:55:46 +0000 (17:55 +0000)]
am
3bca28f1: am
e97602ac: (-s ours) am
437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
* commit '
3bca28f1b240606d63a3e22ffe9ac2053b03dcbb':
Robert Greenwalt [Thu, 27 Aug 2015 17:55:39 +0000 (17:55 +0000)]
am
1d8debe9: am
9fbb071a: (-s ours) am
b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev
* commit '
1d8debe9a322d2c64054604043ff503ac83eca1f':
Jason Monk [Thu, 27 Aug 2015 17:55:31 +0000 (17:55 +0000)]
am
8ca0a4a5: am
edd63864: (-s ours) am
33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
* commit '
8ca0a4a557abd51225f6d2b8539a62e699231b37':
Jae Seo [Thu, 27 Aug 2015 17:55:23 +0000 (17:55 +0000)]
am
3be445da: am
9d8d37b4: (-s ours) am
26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev
* commit '
3be445da221ae89babe505b4216dccbfa6b520cb':
Jeff Sharkey [Thu, 27 Aug 2015 17:55:09 +0000 (17:55 +0000)]
am
85b00533: am
83f5bff6: (-s ours) am
35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev
* commit '
85b0053347bee68c5ff66e1b37620a0cb4d62883':
Roozbeh Pournader [Thu, 27 Aug 2015 17:54:52 +0000 (17:54 +0000)]
am
501879ba: am
0571c02d: (-s ours) am
9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
* commit '
501879bac939a3ed58e2871ab3a084db12fbe779':