OSDN Git Service
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':
Geoff Mendal [Thu, 27 Aug 2015 17:54:35 +0000 (17:54 +0000)]
am
9e648073: (-s ours) am
0de7cba0: (-s ours) am
a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
9e6480734b52a10f2e5d0463c841b2aad3ac9d24':
Dianne Hackborn [Thu, 27 Aug 2015 17:54:12 +0000 (17:54 +0000)]
am
d1abf9fe: am
86e56bb3: (-s ours) am
78ead58d: Merge "Fix issue #
22531747: Assist info should declare if user has disabled..." into mnc-dev
* commit '
d1abf9fe9bf6b4984a8ec834662799584d0199e9':
Wale Ogunwale [Thu, 27 Aug 2015 17:53:57 +0000 (17:53 +0000)]
am
0ee71576: am
e4764abd: (-s ours) am
bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev
* commit '
0ee715767fda64632cfb6e980246b6853a7975c5':
Ricardo Garcia [Thu, 27 Aug 2015 17:53:43 +0000 (17:53 +0000)]
am
7b80cb95: am
d199589b: (-s ours) am
2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
* commit '
7b80cb9515b52d357997d0639da24ed8c42ceb97':
Billy Lau [Thu, 27 Aug 2015 17:53:35 +0000 (17:53 +0000)]
am
0e0ecf9e: am
ffdd2e85: (-s ours) am
072e04a7: Merge "Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
* commit '
0e0ecf9e98d09f112b7d5ac0c81ecd8b49d4fe55':
Jeff Sharkey [Thu, 27 Aug 2015 17:53:27 +0000 (17:53 +0000)]
am
3765a912: am
461031f6: (-s ours) am
71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev
* commit '
3765a912b67b5677f964f8815864bd3f19db1ad7':
Jean-Michel Trivi [Thu, 27 Aug 2015 17:53:18 +0000 (17:53 +0000)]
am
79ac13d1: am
0f7e973d: (-s ours) am
698250fa: Merge "Media button intent should be send to current user only." into mnc-dev
* commit '
79ac13d1584f3e5dd003d9b04d09b89d246f4fd1':
Christopher Tate [Thu, 27 Aug 2015 17:53:06 +0000 (17:53 +0000)]
am
43b94bc5: am
5b1ec7e7: (-s ours) am
6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev
* commit '
43b94bc5edaa0f2c73dfc161eb3f7701e13d480e':
Jorim Jaggi [Thu, 27 Aug 2015 17:52:47 +0000 (17:52 +0000)]
am
c3c7a635: am
7f19c443: (-s ours) am
29cf9aea: Adjust fingerprint icon placement to spec
* commit '
c3c7a6350653b53dc0ad5733d452f4571c3dab6a':
Chris Craik [Thu, 27 Aug 2015 17:52:05 +0000 (17:52 +0000)]
am
92f619fb: am
ce7ef752: (-s ours) am
0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
* commit '
92f619fbad49d8b5292ca6fb97683295b0910e89':
Adrian Roos [Thu, 27 Aug 2015 17:51:12 +0000 (17:51 +0000)]
am
6c91c60c: am
495cd539: (-s ours) am
57ee4b87: Merge "Fix image wallpaper size" into mnc-dev
* commit '
6c91c60cd4c674e7b35c286aeeb61ddd6073af7a':
Jeff Sharkey [Thu, 27 Aug 2015 17:50:32 +0000 (17:50 +0000)]
am
433a8ae3: am
9f01d72f: (-s ours) am
c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev
* commit '
433a8ae3d8851e136b75174e2aa89e71b9634f7a':
Chet Haase [Thu, 27 Aug 2015 17:49:56 +0000 (17:49 +0000)]
am
dfbcbcb9: am
f5f85001: (-s ours) am
d3f327be: Merge "Localize SimpleMonthView" into mnc-dev
* commit '
dfbcbcb9c8ed61eefbc192807f80f7ec8ac22d3d':
Jeff Sharkey [Thu, 27 Aug 2015 17:49:28 +0000 (17:49 +0000)]
am
756485b3: am
ee249f35: (-s ours) am
25945302: Merge "Persist version data on a per-volume basis." into mnc-dev
* commit '
756485b306f7f0db3fea8f3b12e4037c73c83a37':
xinhe [Thu, 27 Aug 2015 17:49:10 +0000 (17:49 +0000)]
am
5925036b: am
bdb2e9d8: (-s ours) am
822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
* commit '
5925036b2471dcfdfb5b614bfd2a15704e59c5b0':
Stephen Hines [Thu, 27 Aug 2015 17:48:43 +0000 (17:48 +0000)]
am
acdfba26: am
dd67c9d6: (-s ours) am
0f5b7bc2: am
79a1bde2: Merge "Add a flag to the API to specify -O0 on the bcc command line."
* commit '
acdfba266444cba4db27dded307268f59221f027':
Svetoslav Ganov [Thu, 27 Aug 2015 17:48:07 +0000 (17:48 +0000)]
am
89c2ea3b: am
98ddad40: (-s ours) am
fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit '
89c2ea3b4781f5d775ec7c9ebe36a11eb85fe561':
Dianne Hackborn [Thu, 27 Aug 2015 17:47:16 +0000 (17:47 +0000)]
am
5b3059d2: am
96311136: (-s ours) am
5c269121: Merge "Work on issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
5b3059d2e07707394211255dde425ed5f1f8bd67':
Svet Ganov [Thu, 27 Aug 2015 17:46:33 +0000 (17:46 +0000)]
am
f9099c68: am
b6eb10db: (-s ours) am
5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev
* commit '
f9099c68595a6b1d84b2b283b92967ff29359364':
Svet Ganov [Thu, 27 Aug 2015 17:45:58 +0000 (17:45 +0000)]
am
1cdb44d1: am
15db4eae: (-s ours) am
4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
* commit '
1cdb44d1243ecc6ab4143d5c39cf8b35051e37c8':
ztenghui [Thu, 27 Aug 2015 17:45:29 +0000 (17:45 +0000)]
am
5817a2e2: am
268eb72c: (-s ours) am
094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '
5817a2e249ed6af8ae63f31d1503f6c22cb5768d':
Julia Reynolds [Thu, 27 Aug 2015 17:45:01 +0000 (17:45 +0000)]
am
2a1b3300: am
f6e06144: (-s ours) am
3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev
* commit '
2a1b330009981d16a0d4901b4051e3713352d0d6':
Wale Ogunwale [Thu, 27 Aug 2015 17:44:35 +0000 (17:44 +0000)]
am
1d36b9e2: am
566c796a: (-s ours) am
af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev
* commit '
1d36b9e2299b9823e5bedbaba9fb7c2d0fd94974':
Mady Mellor [Thu, 27 Aug 2015 17:44:05 +0000 (17:44 +0000)]
am
60eea28f: am
2693eea2: (-s ours) am
9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev
* commit '
60eea28f1ba148bf78c6d67ec1ff1f4aba7c167e':
Tingting Wang [Thu, 27 Aug 2015 17:43:29 +0000 (17:43 +0000)]
am
40496297: am
a14b0339: (-s ours) am
ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit '
404962977b66a0e3cc1bf9bc9373354b049cdb7a':
Svetoslav Ganov [Thu, 27 Aug 2015 17:42:59 +0000 (17:42 +0000)]
am
59e92239: am
2d395df9: (-s ours) am
2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit '
59e9223965bd0b5bf41868ff56f1d4d77f92dc70':
Svet Ganov [Thu, 27 Aug 2015 17:42:43 +0000 (17:42 +0000)]
am
0cbfa6b2: am
8ffb3269: (-s ours) am
ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev
* commit '
0cbfa6b2a5c6fae87eefe5b596dadca7c0228838':
Chien-Yu Chen [Thu, 27 Aug 2015 17:42:30 +0000 (17:42 +0000)]
am
37c6bb75: am
6dfe05b2: (-s ours) am
aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit '
37c6bb75b9c334d49a9521b6654cef21ad7f4b1d':
Eino-Ville Talvala [Thu, 27 Aug 2015 17:42:14 +0000 (17:42 +0000)]
am
24d1c2ef: am
e09a78d3: (-s ours) am
6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
* commit '
24d1c2ef35653c70bc356ab0f1c18f1cc55debde':
Nancy Chen [Thu, 27 Aug 2015 17:41:52 +0000 (17:41 +0000)]
am
f60d3cd7: am
e2f7ef74: (-s ours) am
660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev
* commit '
f60d3cd7685789001d7b2915d26cb994def8ab3c':
Julia Reynolds [Thu, 27 Aug 2015 17:41:17 +0000 (17:41 +0000)]
am
8630dc6e: am
a7ef7e8c: (-s ours) am
593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev
* commit '
8630dc6e2f032a9988fdd29241ed61592bea0261':
Todd Kennedy [Thu, 27 Aug 2015 17:40:48 +0000 (17:40 +0000)]
am
e8963bf4: am
d251dc81: (-s ours) am
5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev
* commit '
e8963bf469fef1cded6b9cf606a76908dea3bd6c':
Lajos Molnar [Thu, 27 Aug 2015 17:40:31 +0000 (17:40 +0000)]
am
077dbf13: am
90f2b9da: (-s ours) am
e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev
* commit '
077dbf13036ef0ec59de079413b61500702b704c':
Neil Fuller [Thu, 27 Aug 2015 17:40:16 +0000 (17:40 +0000)]
am
75f58f7b: am
04405925: (-s ours) resolved conflicts for merge of
71165ea6 to mnc-dev-plus-aosp
* commit '
75f58f7b82fca44917b753b3c57f827a408860f1':
Dirk Dougherty [Thu, 27 Aug 2015 17:40:03 +0000 (17:40 +0000)]
am
9630502f: am
37bbe618: (-s ours) am
9349093c: am
86917496: am
a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
* commit '
9630502fb96da45e1ee1b119555af80bcaa971e3':
Selim Cinek [Thu, 27 Aug 2015 17:39:47 +0000 (17:39 +0000)]
am
788eb39b: am
c4d09707: (-s ours) am
b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
* commit '
788eb39bce132b665d5cd9590c2c5964fae392b3':
Selim Cinek [Thu, 27 Aug 2015 17:39:32 +0000 (17:39 +0000)]
am
ed8f3c8a: am
4f8d5840: (-s ours) am
60e15dae: Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev
* commit '
ed8f3c8a9dbd4724f53130ae6d41247bbca05f17':
Jae Seo [Thu, 27 Aug 2015 17:39:09 +0000 (17:39 +0000)]
am
c80847d4: am
9cd77be1: (-s ours) am
d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev
* commit '
c80847d44bceb3e18f65d2d630d424407feb8fbb':
Dan Sandler [Thu, 27 Aug 2015 17:38:45 +0000 (17:38 +0000)]
am
b6de88fa: am
45b28129: (-s ours) am
86647987: Icon-related Notifications API changes:
* commit '
b6de88faf5011d7358dfd78130831ac861d3d690':
Adrian Roos [Thu, 27 Aug 2015 17:38:18 +0000 (17:38 +0000)]
am
79b4150c: am
86c421b4: (-s ours) am
5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev
* commit '
79b4150c667231be0b7c6d4e8d9a65d2cd6f314e':
Adam Powell [Thu, 27 Aug 2015 17:38:01 +0000 (17:38 +0000)]
am
24edbe02: am
0cad2b60: (-s ours) am
9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
* commit '
24edbe024b3370d2b7abd3a7ee008b5bcd658258':
Svet Ganov [Thu, 27 Aug 2015 17:37:46 +0000 (17:37 +0000)]
am
e508d867: am
2264842f: (-s ours) am
6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
* commit '
e508d867e3cfd285dc996644c983093afc9bdd32':
Roshan Pius [Thu, 27 Aug 2015 17:37:35 +0000 (17:37 +0000)]
am
504e699a: am
d352bb55: (-s ours) am
5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev
* commit '
504e699a59f1432c43ccf3af685a0557922824f0':
Alex Klyubin [Thu, 27 Aug 2015 17:37:25 +0000 (17:37 +0000)]
am
75efd80b: am
3ddc42fe: (-s ours) am
f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev
* commit '
75efd80b2b15ac693d1693c495a3d728839b1376':
Svet Ganov [Thu, 27 Aug 2015 17:37:18 +0000 (17:37 +0000)]
am
2bab9d74: am
f10d7708: (-s ours) am
d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
* commit '
2bab9d74f5d1fef179b250630fec837d0d9e9ac0':
Chris Craik [Thu, 27 Aug 2015 17:37:10 +0000 (17:37 +0000)]
am
e018d8be: am
cb778a8e: (-s ours) am
0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev
* commit '
e018d8be73858039aa2d229873102d609da2e649':
Dianne Hackborn [Thu, 27 Aug 2015 17:36:57 +0000 (17:36 +0000)]
am
13184037: am
628d4653: (-s ours) am
aaee5b53: Merge "Work on issue #
22516282: ChooserTarget URI grants not forwarded" into mnc-dev
* commit '
131840372a1bb2dd305be625dcb07ebdf35e4ca7':
Makoto Onuki [Thu, 27 Aug 2015 17:36:45 +0000 (17:36 +0000)]
am
dbf8c417: am
890e3064: (-s ours) am
b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit '
dbf8c417ce56540e9a12443f13abbadadea51100':
Svet Ganov [Thu, 27 Aug 2015 17:36:28 +0000 (17:36 +0000)]
am
040081b1: am
f1be0792: (-s ours) am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
040081b1c2e267054e1f19aefeb6a75df671b8b9':
Robert Schaub [Thu, 27 Aug 2015 17:35:59 +0000 (17:35 +0000)]
am
38f61814: am
d8a869cb: (-s ours) am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
38f61814f114503ab8bc9a8487ba867b814a7121':
Dianne Hackborn [Thu, 27 Aug 2015 17:35:39 +0000 (17:35 +0000)]
am
eda87980: am
cf5375d8: (-s ours) am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
eda87980f671057a414d0e21efc60bc9235d8984':
Miao Wang [Thu, 27 Aug 2015 17:35:21 +0000 (17:35 +0000)]
Todd Kennedy [Thu, 27 Aug 2015 17:35:04 +0000 (17:35 +0000)]
am
012956b0: am
ff4b10d3: (-s ours) am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
012956b0feebedd11410556268ba2dac7d4688ac':
Wale Ogunwale [Thu, 27 Aug 2015 17:34:56 +0000 (17:34 +0000)]
am
adc2e039: am
fde33da1: (-s ours) am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
adc2e039ec17e1f07faf706f91ff69870585da89':
John Reck [Thu, 27 Aug 2015 17:34:45 +0000 (17:34 +0000)]
am
840af451: am
7e560444: (-s ours) am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
840af451e502ba1d83da0a3a4fc4d593eaf63a9c':
Tony Mak [Thu, 27 Aug 2015 17:34:30 +0000 (17:34 +0000)]
am
b9510506: am
e90017d9: (-s ours) am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
b95105065015686cc11870ee5e95493896915a49':