OSDN Git Service

android-x86/frameworks-base.git
10 years agoam b9b9a384: am 80b3614d: am 8179618c: Merge "Volume: haptic feedback entering vibrat...
John Spurlock [Mon, 21 Jul 2014 18:27:28 +0000 (18:27 +0000)]
am b9b9a384: am 80b3614d: am 8179618c: Merge "Volume: haptic feedback entering vibrate using touch." into lmp-dev

* commit 'b9b9a3849dce8df4a38703868aeaf0bbce78f613':
  Volume: haptic feedback entering vibrate using touch.

10 years agoam 6a4f1092: am 237b2100: am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev
John Spurlock [Mon, 21 Jul 2014 18:27:24 +0000 (18:27 +0000)]
am 6a4f1092: am 237b2100: am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev

* commit '6a4f1092546196d5832611eea3fab417cb03bd4c':
  Volume: Design followup.

10 years agoam 5429c92e: am ceb9bbf0: am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge...
David Friedman [Mon, 21 Jul 2014 18:27:19 +0000 (18:27 +0000)]
am 5429c92e: am ceb9bbf0: am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs

* commit '5429c92e8656cde5df973fbaf5acd974ddc6eee1':
  Minor typos, consistency things, one grammatical error.

10 years agoam 2c1c0a74: am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev
Wonsik Kim [Mon, 21 Jul 2014 18:27:14 +0000 (18:27 +0000)]
am 2c1c0a74: am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev

* commit '2c1c0a74df0751556ad889e37e51e1523f9a6e21':
  TIF: revise API names

10 years agoam feefd412: am 36a86f03: am e4b360e7: Volume: new coat of paint.
John Spurlock [Mon, 21 Jul 2014 18:27:09 +0000 (18:27 +0000)]
am feefd412: am 36a86f03: am e4b360e7: Volume: new coat of paint.

* commit 'feefd41299f85f14055e73e05a601ae4c99f5f24':
  Volume: new coat of paint.

10 years agoam dbbc3688: (-s ours) am 7a9b1324: am 4aa0295b: Merge "Remove deprecated locales...
Baligh Uddin [Mon, 21 Jul 2014 18:27:04 +0000 (18:27 +0000)]
am dbbc3688: (-s ours) am 7a9b1324: am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit 'dbbc36888c405e3143afe61cdba5b64bdc1eab7c':
  Remove deprecated locales - DO NOT MERGE

10 years agoam 0d714b7e: am cc19d68a: am bf5ecd02: Merge "Don\'t apply the ActionBar style to...
Adam Powell [Mon, 21 Jul 2014 18:26:59 +0000 (18:26 +0000)]
am 0d714b7e: am cc19d68a: am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev

* commit '0d714b7e0cfe11543970120a96aa78298321bdbe':
  Don't apply the ActionBar style to a Toolbar as a result of setActionBar

10 years agoam b0e50834: (-s ours) am 82b01b2b: am 53fd859f: Merge "Unhide WifiConfiguration...
Chelsea Derrick [Mon, 21 Jul 2014 18:26:54 +0000 (18:26 +0000)]
am b0e50834: (-s ours) am 82b01b2b: am 53fd859f: Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]" into lmp-dev

* commit 'b0e50834b4a69679e3cff1a3440034fafe12bf56':
  Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]

10 years agoam f94a2be4: am b2038ab7: am d073a935: Don\'t overlay the Material.Light theme\'s...
Adam Powell [Mon, 21 Jul 2014 18:26:49 +0000 (18:26 +0000)]
am f94a2be4: am b2038ab7: am d073a935: Don\'t overlay the Material.Light theme\'s homeAsUpIndicator attribute

* commit 'f94a2be420479559791691a314dd557753f75e6e':
  Don't overlay the Material.Light theme's homeAsUpIndicator attribute

10 years agoam 1af33519: am 21827163: am d2494fcc: Merge "Volume: No sound effects on the ringer...
John Spurlock [Mon, 21 Jul 2014 18:26:45 +0000 (18:26 +0000)]
am 1af33519: am 21827163: am d2494fcc: Merge "Volume: No sound effects on the ringer toggle." into lmp-dev

* commit '1af3351908e53bd8f23556cec08795d9ac3077aa':
  Volume: No sound effects on the ringer toggle.

10 years agoam 245582c3: am b7e7e448: am 07e3fccb: Migrate TelecommConstants to TelecommManager
Evan Charlton [Mon, 21 Jul 2014 18:26:40 +0000 (18:26 +0000)]
am 245582c3: am b7e7e448: am 07e3fccb: Migrate TelecommConstants to TelecommManager

* commit '245582c371857c1a3648af89e14983e424841d75':
  Migrate TelecommConstants to TelecommManager

10 years agoam ca59026d: am 1fab88a4: am 16f6e259: Merge "Add audioAttributes to Notification...
John Spurlock [Mon, 21 Jul 2014 18:26:30 +0000 (18:26 +0000)]
am ca59026d: am 1fab88a4: am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev

* commit 'ca59026d9a45f1cae4758f53d979a05d36c200f9':
  Add audioAttributes to Notification.

10 years agoam b59caea4: am eebe1ea4: am 2f474cd3: Merge "Volume: restore vibration entering...
John Spurlock [Mon, 21 Jul 2014 18:26:25 +0000 (18:26 +0000)]
am b59caea4: am eebe1ea4: am 2f474cd3: Merge "Volume: restore vibration entering vibrate-mode from rocker." into lmp-dev

* commit 'b59caea490051ecc167afa39d603d16f12a6845c':
  Volume: restore vibration entering vibrate-mode from rocker.

10 years agoam 29297801: (-s ours) am 0338db63: (-s ours) am c5a06854: (-s ours) Merge "Import...
Baligh Uddin [Mon, 21 Jul 2014 18:26:17 +0000 (18:26 +0000)]
am 29297801: (-s ours) am 0338db63: (-s ours) am c5a06854: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '29297801e7b9cb246c5033cfdac08ac0ccd3b4c0':
  Import translations. DO NOT MERGE

10 years agoam 6a990e09: (-s ours) am b9604928: (-s ours) am 7d51820d: (-s ours) Merge "Import...
Baligh Uddin [Mon, 21 Jul 2014 18:26:12 +0000 (18:26 +0000)]
am 6a990e09: (-s ours) am b9604928: (-s ours) am 7d51820d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6a990e095cacba684a2ca74b8511c7c941741d3e':
  Import translations. DO NOT MERGE

10 years agoam 17d8b652: (-s ours) am a28477fa: (-s ours) am e03c9fe9: (-s ours) Merge "Import...
Baligh Uddin [Mon, 21 Jul 2014 18:25:59 +0000 (18:25 +0000)]
am 17d8b652: (-s ours) am a28477fa: (-s ours) am e03c9fe9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '17d8b65217b671d2a163341a5ef74a4248740765':
  Import translations. DO NOT MERGE

10 years agoam 8b8c2ea9: (-s ours) am 81c4448b: (-s ours) am e73dab52: (-s ours) Merge "Import...
Baligh Uddin [Mon, 21 Jul 2014 18:25:55 +0000 (18:25 +0000)]
am 8b8c2ea9: (-s ours) am 81c4448b: (-s ours) am e73dab52: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '8b8c2ea9830090efd994a427667d4a7f9db49f12':
  Import translations. DO NOT MERGE

10 years agoam e6062418: (-s ours) am ec0b6061: (-s ours) am af51f737: (-s ours) Import translati...
Baligh Uddin [Mon, 21 Jul 2014 18:25:50 +0000 (18:25 +0000)]
am e6062418: (-s ours) am ec0b6061: (-s ours) am af51f737: (-s ours) Import translations. DO NOT MERGE

* commit 'e60624185925460fe72a7866a8c252b8ceec2dcf':
  Import translations. DO NOT MERGE

10 years agoam b2d91c72: am 9b19eb14: am 6eb05788: Add a notion of the subscription number
Evan Charlton [Mon, 21 Jul 2014 18:25:45 +0000 (18:25 +0000)]
am b2d91c72: am 9b19eb14: am 6eb05788: Add a notion of the subscription number

* commit 'b2d91c72c6730e1ba1673f6e408bd67c14fb02d8':
  Add a notion of the subscription number

10 years agoam 476fff7f: am 01ab1ea4: am 040acd45: Merge "InCallService to inherit directly from...
Santos Cordon [Mon, 21 Jul 2014 18:25:30 +0000 (18:25 +0000)]
am 476fff7f: am 01ab1ea4: am 040acd45: Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev

* commit '476fff7f482a74b026c83d33df4f11c0f42e8ae9':
  InCallService to inherit directly from Service. (1/2)

10 years agoam 10dc0299: am ca355c16: am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev
Adam Powell [Mon, 21 Jul 2014 18:25:25 +0000 (18:25 +0000)]
am 10dc0299: am ca355c16: am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev

* commit '10dc0299a40b2808b5a6489452df339e2eafe397':
  Measure Toolbar titles last

10 years agoam 904ee70a: am 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIF...
John Spurlock [Mon, 21 Jul 2014 18:25:21 +0000 (18:25 +0000)]
am 904ee70a: am 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev

* commit '904ee70a695a76d54bd899e073eec75b1b18dbfe':
  getMasterStreamType from MUSIC -> NOTIFICATION

10 years agoam 31db0307: am 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode
Adam Powell [Mon, 21 Jul 2014 18:25:16 +0000 (18:25 +0000)]
am 31db0307: am 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode

* commit '31db0307c95e7b1bbbd6eca37eca20b12247e23f':
  Fix Toolbar title layout in RTL mode

10 years agoam 52cd54f5: am 00061ce1: am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar...
Adam Powell [Mon, 21 Jul 2014 18:25:12 +0000 (18:25 +0000)]
am 52cd54f5: am 00061ce1: am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev

* commit '52cd54f524adb1f33883d4e79a0c310ee6115bf9':
  Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand

10 years agoam a4c015d2: am acb0d3d9: am da9fd706: Merge "Non-voice-capable device default stream...
John Spurlock [Mon, 21 Jul 2014 18:25:07 +0000 (18:25 +0000)]
am a4c015d2: am acb0d3d9: am da9fd706: Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev

* commit 'a4c015d2dbaf6e5336d89c3faeb90a55649026e5':
  Non-voice-capable device default stream is now NOTIFICATION.

10 years agoam 63281caf: am bc7340e0: am b08dc693: Merge "Remove obsolete (and large) overscroll...
Adam Powell [Mon, 21 Jul 2014 18:25:02 +0000 (18:25 +0000)]
am 63281caf: am bc7340e0: am b08dc693: Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev

* commit '63281caf0f076b79f8a3c48480f2b45d26a51e33':
  Remove obsolete (and large) overscroll drawables

10 years agoam 4704c806: am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.
John Spurlock [Mon, 21 Jul 2014 18:24:58 +0000 (18:24 +0000)]
am 4704c806: am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.

* commit '4704c8067743f36df6fc9622090f422e6bdec2c5':
  Zen mode filtering should use new usage constants.

10 years agoam f0ec8f06: am eb5eb5c8: am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE...
Yohei Yukawa [Mon, 21 Jul 2014 18:24:53 +0000 (18:24 +0000)]
am f0ec8f06: am eb5eb5c8: am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev

* commit 'f0ec8f065eb286e5910b3eaeb2bd0fa5e6f7fec5':
  Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView

10 years agoam cbb951f6: am a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from...
Wonsik Kim [Mon, 21 Jul 2014 18:24:48 +0000 (18:24 +0000)]
am cbb951f6: am a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev

* commit 'cbb951f6bb4435c2cfca260ac3aef34876986013':
  TIF: Reorder TvInputInfo types from old to new.

10 years agoam afa87298: am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into...
Wonsik Kim [Mon, 21 Jul 2014 18:24:43 +0000 (18:24 +0000)]
am afa87298: am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev

* commit 'afa8729857c54b746d23804e077aa6034b47cce3':
  TIF: misc fix for TvInputHal

10 years agoam ea788337: am cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec...
Lajos Molnar [Mon, 21 Jul 2014 18:24:38 +0000 (18:24 +0000)]
am ea788337: am cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features

* commit 'ea788337e49ffac2a7ff3f3826ffdd77b83cd525':
  Extend MediaCodecInfo to describe usable codec limits and features

10 years agoam 5fbc6cae: am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into...
Jeff Brown [Mon, 21 Jul 2014 18:24:33 +0000 (18:24 +0000)]
am 5fbc6cae: am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev

* commit '5fbc6cae0c643be46de3c7c720c8e26a182514fa':
  Allow dreams to wake up gently.

10 years agoam 3dff1c6d: am c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrappe...
Dongwon Kang [Mon, 21 Jul 2014 18:24:27 +0000 (18:24 +0000)]
am 3dff1c6d: am c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev

* commit '3dff1c6dc2e73e99437bccdb47d10eb5155ed03c':
  TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.

10 years agoam 22193893: am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
Jeff Brown [Mon, 21 Jul 2014 18:24:21 +0000 (18:24 +0000)]
am 22193893: am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.

* commit '22193893f7a79f1351caf157a8d6932e7ec3c825':
  Add new Display.STATE_DOZE_SUSPEND power state.

10 years agoam e3576308: am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the...
Jae Seo [Mon, 21 Jul 2014 18:24:15 +0000 (18:24 +0000)]
am e3576308: am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev

* commit 'e3576308987b508384c8689940ec71fbfb39b580':
  TIF: Add a way to notify whether the current program content is allowed

10 years agoam e5469d04: am 761e298b: am b09a6670: Return Animator instead of ValueAnimator
John Reck [Mon, 21 Jul 2014 18:24:07 +0000 (18:24 +0000)]
am e5469d04: am 761e298b: am b09a6670: Return Animator instead of ValueAnimator

* commit 'e5469d0478c4319b05f569c24e21c2f0821390e4':
  Return Animator instead of ValueAnimator

10 years agoam 17b4d928: am 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background"
Fabrice Di Meglio [Mon, 21 Jul 2014 18:24:00 +0000 (18:24 +0000)]
am 17b4d928: am 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background"

* commit '17b4d92850ea036577ab71e17909d7a14e7f6042':
  Revert "Fix LocalePicker background"

10 years agoam 9d2698b3: am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2).
Wei Wang [Mon, 21 Jul 2014 18:23:56 +0000 (18:23 +0000)]
am 9d2698b3: am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2).

* commit '9d2698b3a34618852bd88a30a54f6e608b18f14d':
  More API modification of BLE APIs (1/2).

10 years agoam bf99d8c3: am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type...
Jean-Michel Trivi [Mon, 21 Jul 2014 18:23:51 +0000 (18:23 +0000)]
am bf99d8c3: am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev

* commit 'bf99d8c31160cf61a25371759068592461cbc71a':
  Add AudioAttributes to stream type conversion

10 years agoam 11724dc5: am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with...
Jean-Michel Trivi [Mon, 21 Jul 2014 18:23:46 +0000 (18:23 +0000)]
am 11724dc5: am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev

* commit '11724dc595bb0550de376212d27909409a112cbb':
  Unhide AudioTrack constructor with AudioAttributes, AudioFormat

10 years agoam fc91979d: am 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs...
Quddus Chong [Mon, 21 Jul 2014 18:23:42 +0000 (18:23 +0000)]
am fc91979d: am 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

* commit 'fc91979d1dddcd0df677e4b1e1a51d29ad7e75d5':
  docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

10 years agoam 6d989248: am 2895133f: am 6b1ceb42: am 296459ff: am f4989910: am d32dd294: am...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:37 +0000 (18:23 +0000)]
am 6d989248: am 2895133f: am 6b1ceb42: am 296459ff: am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style reso

* commit '6d9892480be9f7deb8dbb94dbf3ad18b89fb65b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam f861385f: am 4ed3d208: am 59987f2d: am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:33 +0000 (18:23 +0000)]
am f861385f: am 4ed3d208: am 59987f2d: am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NO

* commit 'f861385fa987545b21bbd94eacebc86f626db63b':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam b053d188: (-s ours) am 05900237: am 78bbb2a1: am 90824671: (-s ours) am 98b24366...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:29 +0000 (18:23 +0000)]
am b053d188: (-s ours) am 05900237: am 78bbb2a1: am 90824671: (-s ours) am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'b053d188833e5ed106e67cf336f7cf3b656128c3':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 32c2b20c: (-s ours) am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:25 +0000 (18:23 +0000)]
am 32c2b20c: (-s ours) am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '32c2b20cb78258b995cecf8cbb5e38fe44895944':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 3ed46147: (-s ours) am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:20 +0000 (18:23 +0000)]
am 3ed46147: (-s ours) am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '3ed4614798855cf135625c98b6a247a263981e2c':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 9b907157: (-s ours) am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:16 +0000 (18:23 +0000)]
am 9b907157: (-s ours) am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit '9b90715728ee06300c1a8729c553563388301734':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 25d0097f: (-s ours) am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:12 +0000 (18:23 +0000)]
am 25d0097f: (-s ours) am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit '25d0097f2bf43f5748a36e074d1a68b5bc14a403':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam f7ab7f0a: am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command...
Guang Zhu [Mon, 21 Jul 2014 18:23:08 +0000 (18:23 +0000)]
am f7ab7f0a: am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev

* commit 'f7ab7f0affdae345d0a162002aabfda4742536a8':
  add command to enable bt snoop log

10 years agoam c9476fe0: am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirt...
Jean-Michel Trivi [Mon, 21 Jul 2014 18:23:03 +0000 (18:23 +0000)]
am c9476fe0: am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev

* commit 'c9476fe02e66ae121c0994637a62ea0b6b546c52':
  Hide AudioManager.startBluetoothScoVirtualCall()

10 years agoam 28003199: am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)
Santos Cordon [Mon, 21 Jul 2014 18:22:59 +0000 (18:22 +0000)]
am 28003199: am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)

* commit '280031995f0770e84073a894253b936e4af23566':
  Fixing ADD_CALL (1/3)

10 years agoam 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev
Chris Craik [Mon, 21 Jul 2014 18:22:53 +0000 (18:22 +0000)]
am 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev

* commit '0a3bcdccb14aa7247463aa91de1cc7e3e1ea148f':
  Tweaks to outline API

10 years agoam bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION...
Adam Powell [Mon, 21 Jul 2014 18:22:48 +0000 (18:22 +0000)]
am bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev

* commit 'bd90f0ce2d052d2e0d753e0cc7b10a1f658b496e':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER

10 years agoam d4c489a8: am c5989521: am c5a8e2f1: Rename voicemail permissions
Yorke Lee [Mon, 21 Jul 2014 18:22:44 +0000 (18:22 +0000)]
am d4c489a8: am c5989521: am c5a8e2f1: Rename voicemail permissions

* commit 'd4c489a867b95431fbab388bbc4cd4da57165e84':
  Rename voicemail permissions

10 years agoam 0924a642: am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app...
Shishir Agrawal [Mon, 21 Jul 2014 18:22:38 +0000 (18:22 +0000)]
am 0924a642: am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev

* commit '0924a6422b3dad4bad0701c1f834cc6b5451ca44':
  Adding the ability for carrier app to override SPN and carrier name.

10 years agoam 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where
Christopher Tate [Mon, 21 Jul 2014 18:22:33 +0000 (18:22 +0000)]
am 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where

* commit '0eebcfd7582d576110a42acb799b8a8c639f693f':
  Fix which index goes where

10 years agoam 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into...
Sreeram Ramachandran [Mon, 21 Jul 2014 18:22:28 +0000 (18:22 +0000)]
am 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev

* commit '35de92955536b6f050e4657ece2028fab67d7f7e':
  Allow VPN interfaces to be put into blocking mode.

10 years agoam 80b3614d: am 8179618c: Merge "Volume: haptic feedback entering vibrate using touch...
John Spurlock [Sun, 20 Jul 2014 18:09:26 +0000 (18:09 +0000)]
am 80b3614d: am 8179618c: Merge "Volume: haptic feedback entering vibrate using touch." into lmp-dev

* commit '80b3614d5812d11cd9e1e87cb5cfc0f13d9cc279':
  Volume: haptic feedback entering vibrate using touch.

10 years agoam 237b2100: am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev
John Spurlock [Sun, 20 Jul 2014 18:09:22 +0000 (18:09 +0000)]
am 237b2100: am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev

* commit '237b21006be014f3d5e95a7e8dba6ee2c83e8c4a':
  Volume: Design followup.

10 years agoam ceb9bbf0: am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos...
David Friedman [Sun, 20 Jul 2014 18:09:16 +0000 (18:09 +0000)]
am ceb9bbf0: am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs

* commit 'ceb9bbf0a515938823732fd60053f6d4b87fc3ee':
  Minor typos, consistency things, one grammatical error.

10 years agoam e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev
Wonsik Kim [Sun, 20 Jul 2014 18:09:10 +0000 (18:09 +0000)]
am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev

* commit 'e2d65e08ad9533ab5d94b52dd61d40cd6643a61f':
  TIF: revise API names

10 years agoam 36a86f03: am e4b360e7: Volume: new coat of paint.
John Spurlock [Sun, 20 Jul 2014 18:09:06 +0000 (18:09 +0000)]
am 36a86f03: am e4b360e7: Volume: new coat of paint.

* commit '36a86f03f05ea3a50342e9f324c3453e6e6d6beb':
  Volume: new coat of paint.

10 years agoam 7a9b1324: am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 20 Jul 2014 18:08:16 +0000 (18:08 +0000)]
am 7a9b1324: am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '7a9b13241ee64106d9f466c35f43bf76ea446401':
  Remove deprecated locales - DO NOT MERGE

10 years agoam cc19d68a: am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as...
Adam Powell [Sun, 20 Jul 2014 18:07:54 +0000 (18:07 +0000)]
am cc19d68a: am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev

* commit 'cc19d68a90486ace893ad381911e9f675f1cf3d0':
  Don't apply the ActionBar style to a Toolbar as a result of setActionBar

10 years agoam 82b01b2b: am 53fd859f: Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE...
Chelsea Derrick [Sun, 20 Jul 2014 18:07:50 +0000 (18:07 +0000)]
am 82b01b2b: am 53fd859f: Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]" into lmp-dev

* commit '82b01b2bf4752a03ee64d8a9a53038bf02c115d1':
  Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]

10 years agoam b2038ab7: am d073a935: Don\'t overlay the Material.Light theme\'s homeAsUpIndicato...
Adam Powell [Sun, 20 Jul 2014 18:07:46 +0000 (18:07 +0000)]
am b2038ab7: am d073a935: Don\'t overlay the Material.Light theme\'s homeAsUpIndicator attribute

* commit 'b2038ab70a867e6d6d0500730784d63f87913c5d':
  Don't overlay the Material.Light theme's homeAsUpIndicator attribute

10 years agoam 21827163: am d2494fcc: Merge "Volume: No sound effects on the ringer toggle."...
John Spurlock [Sun, 20 Jul 2014 18:07:41 +0000 (18:07 +0000)]
am 21827163: am d2494fcc: Merge "Volume: No sound effects on the ringer toggle." into lmp-dev

* commit '218271635378418c51bf6343f6adfd9e22156b05':
  Volume: No sound effects on the ringer toggle.

10 years agoam b7e7e448: am 07e3fccb: Migrate TelecommConstants to TelecommManager
Evan Charlton [Sun, 20 Jul 2014 18:07:35 +0000 (18:07 +0000)]
am b7e7e448: am 07e3fccb: Migrate TelecommConstants to TelecommManager

* commit 'b7e7e4484824dfba837c58a037addfa10ff67879':
  Migrate TelecommConstants to TelecommManager

10 years agoam 1fab88a4: am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev
John Spurlock [Sun, 20 Jul 2014 18:07:23 +0000 (18:07 +0000)]
am 1fab88a4: am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev

* commit '1fab88a4d5e79b516a382474d777a212c5989f68':
  Add audioAttributes to Notification.

10 years agoam eebe1ea4: am 2f474cd3: Merge "Volume: restore vibration entering vibrate-mode...
John Spurlock [Sun, 20 Jul 2014 18:07:19 +0000 (18:07 +0000)]
am eebe1ea4: am 2f474cd3: Merge "Volume: restore vibration entering vibrate-mode from rocker." into lmp-dev

* commit 'eebe1ea48b26150e550af37101487e5b82df868f':
  Volume: restore vibration entering vibrate-mode from rocker.

10 years agoam 0338db63: (-s ours) am c5a06854: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 20 Jul 2014 18:07:11 +0000 (18:07 +0000)]
am 0338db63: (-s ours) am c5a06854: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0338db63db0514913e997c4a4cfc05d5b3fcfb89':
  Import translations. DO NOT MERGE

10 years agoam b9604928: (-s ours) am 7d51820d: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 20 Jul 2014 18:07:07 +0000 (18:07 +0000)]
am b9604928: (-s ours) am 7d51820d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'b9604928cda038efe7badf687a2de93d8e643756':
  Import translations. DO NOT MERGE

10 years agoam a28477fa: (-s ours) am e03c9fe9: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 20 Jul 2014 18:07:02 +0000 (18:07 +0000)]
am a28477fa: (-s ours) am e03c9fe9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a28477fa1ee1dcf863a32eedbd866cf2ab8bbb0e':
  Import translations. DO NOT MERGE

10 years agoam 81c4448b: (-s ours) am e73dab52: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 20 Jul 2014 18:06:58 +0000 (18:06 +0000)]
am 81c4448b: (-s ours) am e73dab52: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '81c4448b147f1e1e9168358741648e3289ce3266':
  Import translations. DO NOT MERGE

10 years agoam ec0b6061: (-s ours) am af51f737: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 20 Jul 2014 18:06:54 +0000 (18:06 +0000)]
am ec0b6061: (-s ours) am af51f737: (-s ours) Import translations. DO NOT MERGE

* commit 'ec0b6061763daa8d50658a4579e393a48eae1300':
  Import translations. DO NOT MERGE

10 years agoam 9b19eb14: am 6eb05788: Add a notion of the subscription number
Evan Charlton [Sun, 20 Jul 2014 18:04:51 +0000 (18:04 +0000)]
am 9b19eb14: am 6eb05788: Add a notion of the subscription number

* commit '9b19eb14fdd56427f26a3489cb07778694060835':
  Add a notion of the subscription number

10 years agoam 01ab1ea4: am 040acd45: Merge "InCallService to inherit directly from Service....
Santos Cordon [Sun, 20 Jul 2014 18:04:45 +0000 (18:04 +0000)]
am 01ab1ea4: am 040acd45: Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev

* commit '01ab1ea4dd4a99badc320bc758b7a1c4008a91f9':
  InCallService to inherit directly from Service. (1/2)

10 years agoam ca355c16: am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev
Adam Powell [Sun, 20 Jul 2014 18:04:38 +0000 (18:04 +0000)]
am ca355c16: am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev

* commit 'ca355c16f188d847b55cd0efa25c86db44dcc36c':
  Measure Toolbar titles last

10 years agoam 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION"...
John Spurlock [Sun, 20 Jul 2014 18:04:34 +0000 (18:04 +0000)]
am 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev

* commit '241a23453fbe55e2b36ea6ff43da71e765283dd3':
  getMasterStreamType from MUSIC -> NOTIFICATION

10 years agoam 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode
Adam Powell [Sun, 20 Jul 2014 18:04:30 +0000 (18:04 +0000)]
am 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode

* commit '71ff46d2f67fb90d6b959adb0f162b889a57be17':
  Fix Toolbar title layout in RTL mode

10 years agoam 00061ce1: am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams...
Adam Powell [Sun, 20 Jul 2014 18:04:23 +0000 (18:04 +0000)]
am 00061ce1: am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev

* commit '00061ce1363d6ffa8e94f15048db5a61bb5088cf':
  Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand

10 years agoam acb0d3d9: am da9fd706: Merge "Non-voice-capable device default stream is now NOTIF...
John Spurlock [Sun, 20 Jul 2014 18:04:18 +0000 (18:04 +0000)]
am acb0d3d9: am da9fd706: Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev

* commit 'acb0d3d98a116585de4fb460daf11c2bd6f95913':
  Non-voice-capable device default stream is now NOTIFICATION.

10 years agoam bc7340e0: am b08dc693: Merge "Remove obsolete (and large) overscroll drawables...
Adam Powell [Sun, 20 Jul 2014 18:04:12 +0000 (18:04 +0000)]
am bc7340e0: am b08dc693: Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev

* commit 'bc7340e006da8eac639e4fae7dca9c3006ee607d':
  Remove obsolete (and large) overscroll drawables

10 years agoam 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.
John Spurlock [Sun, 20 Jul 2014 18:04:06 +0000 (18:04 +0000)]
am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.

* commit '3897183d7bd884c4a01b22dccce75df48e93ab4a':
  Zen mode filtering should use new usage constants.

10 years agoam eb5eb5c8: am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in...
Yohei Yukawa [Sun, 20 Jul 2014 18:03:59 +0000 (18:03 +0000)]
am eb5eb5c8: am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev

* commit 'eb5eb5c81d25e20cfdbf77494913576dcb974e13':
  Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView

10 years agoam a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new....
Wonsik Kim [Sun, 20 Jul 2014 18:03:54 +0000 (18:03 +0000)]
am a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev

* commit 'a7279448befb62f36534d7a788b0c87db7af2e5e':
  TIF: Reorder TvInputInfo types from old to new.

10 years agoam 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
Wonsik Kim [Sun, 20 Jul 2014 18:03:49 +0000 (18:03 +0000)]
am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev

* commit '1042ee6be6294ad07ccda31571641996abc88bde':
  TIF: misc fix for TvInputHal

10 years agoam cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and...
Lajos Molnar [Sun, 20 Jul 2014 18:03:40 +0000 (18:03 +0000)]
am cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features

* commit 'cebc7989d7a4fa16396ed4b3be6d1922cefaea24':
  Extend MediaCodecInfo to describe usable codec limits and features

10 years agoam 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
Jeff Brown [Sun, 20 Jul 2014 18:03:35 +0000 (18:03 +0000)]
am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev

* commit '958361e92371fd7d3b40fbbd91077ec4d7abe374':
  Allow dreams to wake up gently.

10 years agoam c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService...
Dongwon Kang [Sun, 20 Jul 2014 18:03:30 +0000 (18:03 +0000)]
am c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev

* commit 'c90b613ca3cbe21c871c0b98ed3ceabe2a7a3a09':
  TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.

10 years agoam 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
Jeff Brown [Sun, 20 Jul 2014 18:03:26 +0000 (18:03 +0000)]
am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.

* commit '610014e6501d3543f33aedcc7f302288afcc4df4':
  Add new Display.STATE_DOZE_SUSPEND power state.

10 years agoam c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program...
Jae Seo [Sun, 20 Jul 2014 18:03:09 +0000 (18:03 +0000)]
am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev

* commit 'c936967b84ef7ba70f948bcd99b8355fbdd3c9a4':
  TIF: Add a way to notify whether the current program content is allowed

10 years agoam 761e298b: am b09a6670: Return Animator instead of ValueAnimator
John Reck [Sun, 20 Jul 2014 18:02:59 +0000 (18:02 +0000)]
am 761e298b: am b09a6670: Return Animator instead of ValueAnimator

* commit '761e298b11b31233067daf215ab788bb7042dc33':
  Return Animator instead of ValueAnimator

10 years agoam 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background"
Fabrice Di Meglio [Sun, 20 Jul 2014 18:02:54 +0000 (18:02 +0000)]
am 6b64ac48: am 3a4701fa: Revert "Fix LocalePicker background"

* commit '6b64ac48e0479b84859138907a0ebae88393130b':
  Revert "Fix LocalePicker background"

10 years agoam 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2).
Wei Wang [Sun, 20 Jul 2014 18:02:30 +0000 (18:02 +0000)]
am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2).

* commit '6e065374f53801f4c90c73cadd33157a7c22f900':
  More API modification of BLE APIs (1/2).

10 years agoam 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into...
Jean-Michel Trivi [Sun, 20 Jul 2014 18:01:58 +0000 (18:01 +0000)]
am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev

* commit '895de04e7ca22494e46f20064e2133fc1f915d56':
  Add AudioAttributes to stream type conversion

10 years agoam bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes...
Jean-Michel Trivi [Sun, 20 Jul 2014 18:01:51 +0000 (18:01 +0000)]
am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev

* commit 'bece8116fa302b1ea770d7580941c0ce6a500833':
  Unhide AudioTrack constructor with AudioAttributes, AudioFormat

10 years agoam 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs...
Quddus Chong [Sun, 20 Jul 2014 18:01:38 +0000 (18:01 +0000)]
am 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

* commit '92f7993e56759dc06c9149654f40bcbffd9b281b':
  docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

10 years agoam 2895133f: am 6b1ceb42: am 296459ff: am f4989910: am d32dd294: am b86675f1: am...
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:34 +0000 (18:01 +0000)]
am 2895133f: am 6b1ceb42: am 296459ff: am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for st

* commit '2895133f602caff7a8f610c001a546c19c60c67b':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 4ed3d208: am 59987f2d: am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b93...
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:29 +0000 (18:01 +0000)]
am 4ed3d208: am 59987f2d: am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" int

* commit '4ed3d2089f3f2f45da9c4103a0ebbcb6595b060c':
  Fix style resolution for styles with '.' [DO NOT MERGE]