git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Deepanshu Gupta [Thu, 16 Jul 2015 01:20:46 +0000 (01:20 +0000)]

am 3a165c3d: am 43286266: Merge "Change tools:list_item to listitem." into mnc-dev

* commit '3a165c3de233a70b98c5724c79a358d271815adc':
Change tools:list_item to listitem.

commit | commitdiff | tree

Robert Schaub [Thu, 16 Jul 2015 01:20:42 +0000 (01:20 +0000)]

am 05c874d0: am a73face3: am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.

* commit '05c874d01f28fe4201f7811bf04e78a780e1ae22':
docs: Added word "video" to tv app quality guidelines.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 16 Jul 2015 01:03:32 +0000 (01:03 +0000)]

am 43286266: Merge "Change tools:list_item to listitem." into mnc-dev

* commit '432862667643cf8966a0c727b6772a6bae787da1':
Change tools:list_item to listitem.

commit | commitdiff | tree

Robert Schaub [Thu, 16 Jul 2015 01:03:27 +0000 (01:03 +0000)]

am a73face3: am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.

* commit 'a73face3f43d191f8e9b6e8597043be47f86374e':
docs: Added word "video" to tv app quality guidelines.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 16 Jul 2015 00:59:15 +0000 (00:59 +0000)]

Merge "Change tools:list_item to listitem." into mnc-dev

commit | commitdiff | tree

Jun Mukai [Thu, 16 Jul 2015 00:57:50 +0000 (00:57 +0000)]

am ebcc6f09: am 8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev

* commit 'ebcc6f097e6bf1bc0d41e6665c84c8359305ebf1':
Allow selecting quick setting items by keyboard.

commit | commitdiff | tree

Oren Blasberg [Thu, 16 Jul 2015 00:57:46 +0000 (00:57 +0000)]

am 79362baf: am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

* commit '79362baf5f5a1edb4ff07814ed5c85c72e79fd38':
Make "dismiss all" button keyboard accessible.

commit | commitdiff | tree

Robert Schaub [Thu, 16 Jul 2015 00:54:04 +0000 (00:54 +0000)]

am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.

* commit '8c5f34de91fc1fb148bbee9f868d32ff6103a70a':
docs: Added word "video" to tv app quality guidelines.

commit | commitdiff | tree

Robert Schaub [Thu, 16 Jul 2015 00:43:26 +0000 (00:43 +0000)]

am b53568f2: docs: Added word "video" to tv app quality guidelines.

* commit 'b53568f27c384523dae58af9f4ad355a6c72d6d7':
docs: Added word "video" to tv app quality guidelines.

commit | commitdiff | tree

Adrian Roos [Thu, 16 Jul 2015 00:42:49 +0000 (00:42 +0000)]

am b8550d30: am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev

* commit 'b8550d3036fdf49eeb551ad1e1c9d1a9d06398e2':
Fix wrong tint mode on airplane and vpn icons

commit | commitdiff | tree

Christopher Tate [Thu, 16 Jul 2015 00:42:45 +0000 (00:42 +0000)]

am fbb4e9d2: am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev

* commit 'fbb4e9d23f0d3e3a220e0e3e63934409d615f50c':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

commit | commitdiff | tree

Jun Mukai [Thu, 16 Jul 2015 00:41:35 +0000 (00:41 +0000)]

am 8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev

* commit '8703e50d130351ef45d1ac88755ec58d8ecac737':
Allow selecting quick setting items by keyboard.

commit | commitdiff | tree

Oren Blasberg [Thu, 16 Jul 2015 00:41:31 +0000 (00:41 +0000)]

am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

* commit '84f8a0969322b2d5f40ea1eac0db9996e1876138':
Make "dismiss all" button keyboard accessible.

commit | commitdiff | tree

Jun Mukai [Thu, 16 Jul 2015 00:37:13 +0000 (00:37 +0000)]

Merge "Allow selecting quick setting items by keyboard." into mnc-dev

commit | commitdiff | tree

Billy Lau [Thu, 16 Jul 2015 00:31:35 +0000 (00:31 +0000)]

am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

* commit 'da93454bfa7c46ba5607c74252c458b48a473e9d':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...

commit | commitdiff | tree

Adrian Roos [Thu, 16 Jul 2015 00:31:23 +0000 (00:31 +0000)]

am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev

* commit 'fc8e923d5e551862fe1abaac2256925d6955ca07':
Fix wrong tint mode on airplane and vpn icons

commit | commitdiff | tree

Christopher Tate [Thu, 16 Jul 2015 00:31:18 +0000 (00:31 +0000)]

am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev

* commit '3b1f8607fdc416a87e608499698719f3234ecc90':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

commit | commitdiff | tree

Oren Blasberg [Thu, 16 Jul 2015 00:29:33 +0000 (00:29 +0000)]

Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

commit | commitdiff | tree

Adrian Roos [Thu, 16 Jul 2015 00:27:48 +0000 (00:27 +0000)]

Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev

commit | commitdiff | tree

Billy Lau [Thu, 16 Jul 2015 00:21:44 +0000 (00:21 +0000)]

am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...

commit | commitdiff | tree

Christopher Tate [Thu, 16 Jul 2015 00:20:55 +0000 (00:20 +0000)]

Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev

commit | commitdiff | tree

Billy Lau [Thu, 16 Jul 2015 00:04:32 +0000 (00:04 +0000)]

Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

commit | commitdiff | tree

Christopher Tate [Wed, 15 Jul 2015 23:56:58 +0000 (16:56 -0700)]

Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

Bug 22504009

Change-Id: I565b2ba4d1e5deeee8ede3363819deec206dbf58

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:51:54 +0000 (23:51 +0000)]

am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev

* commit '309f9d6e7f777483f7ede3f8c7bd99ffd4794967':
Implement issue #22403908: Enable assistant to refuse context sharing

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:51:50 +0000 (23:51 +0000)]

am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

* commit '709d013fd6571f0dcae3d3fc6e3be4be1e0787f1':
Fix issue #22487155: Device unresponsive (deadlock in system_server)

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:51:45 +0000 (23:51 +0000)]

am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

* commit 'fc5696404b88035aa9197faeb2ee0bdca284ca76':
Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:51:39 +0000 (23:51 +0000)]

am b3e37b3b: am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev

* commit 'b3e37b3b07ab5923143470bd536922fa525a72cc':
Fix issue #22479881: Nexus 6 randomly rebooting every few hours with...

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:51:34 +0000 (23:51 +0000)]

am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

* commit '0d04da1fb71960c79820bb04cb65c7c41125fcee':
Fix issue #22124996: VI: Command Request not Active

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 23:51:29 +0000 (23:51 +0000)]

am db19e1de: Merge "Fix the build" into mnc-dr-dev

* commit 'db19e1ded0d9bec62e798c6ba7677eefa4ff7c64':
Fix the build

commit | commitdiff | tree

Robert Schaub [Wed, 15 Jul 2015 23:41:22 +0000 (16:41 -0700)]

docs: Added word "video" to tv app quality guidelines.

Bug: 21737663

Change-Id: Ia4edcae6f2089f15156a857da295e89265f56d5d

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:39:32 +0000 (23:39 +0000)]

am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev

* commit 'f6586cbde7d4612963eb2e8a2413235630676b83':
Implement issue #22403908: Enable assistant to refuse context sharing

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:39:27 +0000 (23:39 +0000)]

am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

* commit '67e02e60ca58db95b397fde7bfeeebb012e8aff8':
Fix issue #22487155: Device unresponsive (deadlock in system_server)

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:39:20 +0000 (23:39 +0000)]

am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

* commit 'c4e2bcd4dca0401ca38a45dce04d29b92231d677':
Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:39:16 +0000 (23:39 +0000)]

am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev

* commit 'c1a49b50bf7638484d32ed6dbf863546a47f0e50':
Fix issue #22479881: Nexus 6 randomly rebooting every few hours with...

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:39:12 +0000 (23:39 +0000)]

am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

* commit '1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
Fix issue #22124996: VI: Command Request not Active

commit | commitdiff | tree

Billy Lau [Wed, 15 Jul 2015 21:29:19 +0000 (22:29 +0100)]

Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...

AppOpsManager:
Changed the default mode for SYSTEM_ALERT_WINDOW to MODE_DEFAULT instead of
MODE_ALLOWED. Otherwise, an app that did not declare for this permission will
actually be allowed to perform OP_SYSTEM_ALERT_WINDOW, which is undesirable.
This change also allows callers to make their own decision based on the
current policy (M vs pre-M apps).

policy/PhoneWindowManager:
Added additional checks that will handle MODE_DEFAULT - this happens when an app
is newly installed but not yet configured.

wm/WindowManagerService:
Enriched some checks to include the treatment of MODE_DEFAULT - this will allow
pre-M apps uninterupted capability to draw on top of other apps.

Change-Id: I8de77730e158c97587427820cfba721bd5607bea

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 23:32:29 +0000 (23:32 +0000)]

Merge "Fix the build" into mnc-dr-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:31:09 +0000 (23:31 +0000)]

Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:30:49 +0000 (23:30 +0000)]

Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 19:47:46 +0000 (12:47 -0700)]

Change tools:list_item to listitem.

The listitem is already in use for ListView. Reuse the same attribute
for RecyclerView rather than creating a new one.

Change-Id: I82aabe7d04fbe3e61645bc427a81c14c454d03c5

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:30:16 +0000 (23:30 +0000)]

Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

commit | commitdiff | tree

Svetoslav [Wed, 15 Jul 2015 23:30:09 +0000 (23:30 +0000)]

am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev

* commit 'eb16e1fb2225f2cf84f5c56242a187fba59e39f8':
Make sure we get valid package name or fail.

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:30:06 +0000 (23:30 +0000)]

Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev

commit | commitdiff | tree

Christopher Tate [Wed, 15 Jul 2015 23:30:05 +0000 (23:30 +0000)]

am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev

* commit 'b6b97e90cb247560b880ae7269b5bfb1daa7aeef':
Resolve based on the correct user's default browser

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 23:29:53 +0000 (23:29 +0000)]

Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 23:29:30 +0000 (16:29 -0700)]

Fix the build

Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544

commit | commitdiff | tree

Svetoslav [Wed, 15 Jul 2015 23:13:03 +0000 (23:13 +0000)]

am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev

* commit '08dda27be4678f2ab5bdc7e210d511ec105c158c':
Make sure we get valid package name or fail.

commit | commitdiff | tree

Christopher Tate [Wed, 15 Jul 2015 23:12:59 +0000 (23:12 +0000)]

am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev

* commit '06476508c4aae6b9bb5affdc7470abf159ef9eda':
Resolve based on the correct user's default browser

commit | commitdiff | tree

Svetoslav [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]

Merge "Make sure we get valid package name or fail." into mnc-dev

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]

am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

* commit 'b277786736e41525a232ad7ecb61de706311b295':
Let the ActionBar handle keyboard shortcuts.

commit | commitdiff | tree

Svetoslav [Wed, 15 Jul 2015 22:58:01 +0000 (15:58 -0700)]

Make sure we get valid package name or fail.

bug:22492225

Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c

commit | commitdiff | tree

Christopher Tate [Wed, 15 Jul 2015 22:57:49 +0000 (22:57 +0000)]

Merge "Resolve based on the correct user's default browser" into mnc-dev

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 15 Jul 2015 22:50:16 +0000 (22:50 +0000)]

am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

* commit '6a4014104e85bf4154b353cd0be337f7967cdaeb':
Let the ActionBar handle keyboard shortcuts.

commit | commitdiff | tree

Miao Wang [Wed, 15 Jul 2015 22:46:05 +0000 (22:46 +0000)]

am 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev

* commit '675bed5488edc7af164ca29258630d7c53984040':
fix BNNM docs

commit | commitdiff | tree

Svet Ganov [Wed, 15 Jul 2015 22:46:01 +0000 (22:46 +0000)]

am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

* commit '12b05ec2e7a22fa0cbc1bc55d5a8b6503dbf038c':
Grant default permissions to the setup app robustly.

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:57 +0000 (22:45 +0000)]

am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '76b8b1e663553ecf92d669c02747692233545584':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 15 Jul 2015 22:45:53 +0000 (22:45 +0000)]

am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

* commit '2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70':
Show correct locked orientation on phones

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:49 +0000 (22:45 +0000)]

am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9139d5b0fd3b523deb6fffe534fc07c462604483':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:45 +0000 (22:45 +0000)]

am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:41 +0000 (22:45 +0000)]

am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:37 +0000 (22:45 +0000)]

am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:33 +0000 (22:45 +0000)]

am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0959738e5c0fda80bb655ae1fe317e3f395c6a72':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:29 +0000 (22:45 +0000)]

am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2e51738d7c93e547dbd484014e11d770270030e0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:45:24 +0000 (22:45 +0000)]

am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Jorim Jaggi [Wed, 15 Jul 2015 22:45:20 +0000 (22:45 +0000)]

am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec

* commit '7be40aaa6b1df159962134ff8314539d2805ec43':
Adjust assist disclosure stroke width to spec

commit | commitdiff | tree

Roshan Pius [Wed, 15 Jul 2015 22:45:16 +0000 (22:45 +0000)]

am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '06179c75c84476e96b99004fb677ef9d50dbcdfc':
Handle exceptions when accessing Content providers.

commit | commitdiff | tree

Felipe Leme [Wed, 15 Jul 2015 22:45:11 +0000 (22:45 +0000)]

am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev

* commit 'd9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 22:45:07 +0000 (22:45 +0000)]

am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev

* commit '4a56983fa707985fe5e5ab050acd7306e123d075':
Fix build.

commit | commitdiff | tree

Jeff Brown [Wed, 15 Jul 2015 22:45:03 +0000 (22:45 +0000)]

am 0cb1cfdc: am 76c4c666: Add USB port manager.

* commit '0cb1cfdcc306f78030403c8da22bfcda630c5527':
Add USB port manager.

commit | commitdiff | tree

Jeff Brown [Wed, 15 Jul 2015 22:44:59 +0000 (22:44 +0000)]

am b3c11805: am 2dbccc19: Clean up USB Manager dump.

* commit 'b3c1180538d46a0844620375b67a453acdb456fe':
Clean up USB Manager dump.

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 15 Jul 2015 22:38:55 +0000 (22:38 +0000)]

Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

commit | commitdiff | tree

Miao Wang [Wed, 15 Jul 2015 22:34:47 +0000 (22:34 +0000)]

am ad904cf3: Merge "fix BNNM docs" into mnc-dev

* commit 'ad904cf34219897da731eb65f9de53176cc39b20':
fix BNNM docs

commit | commitdiff | tree

Svet Ganov [Wed, 15 Jul 2015 22:28:10 +0000 (22:28 +0000)]

am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

* commit '75f6b94a5d5cadb218725011729466e8e438b231':
Grant default permissions to the setup app robustly.

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:28:06 +0000 (22:28 +0000)]

am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '78b6e6c742a7872ba23c3684c47ff714dbd80cf6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 15 Jul 2015 22:28:02 +0000 (22:28 +0000)]

am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

* commit '3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
Show correct locked orientation on phones

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:27:58 +0000 (22:27 +0000)]

am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:27:54 +0000 (22:27 +0000)]

am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '197e7381576bee4b8e2e7195811fe94d1b1b28ec':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:27:44 +0000 (22:27 +0000)]

am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:27:39 +0000 (22:27 +0000)]

am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:27:35 +0000 (22:27 +0000)]

am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:27:31 +0000 (22:27 +0000)]

am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '36c103d685a6ba0f04c52bad2cb666789f5179dc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 22:27:26 +0000 (22:27 +0000)]

am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

commit | commitdiff | tree

Jorim Jaggi [Wed, 15 Jul 2015 22:27:07 +0000 (22:27 +0000)]

am eea8be53: Adjust assist disclosure stroke width to spec

* commit 'eea8be533874f279016279cd68618a6592b3dbed':
Adjust assist disclosure stroke width to spec

commit | commitdiff | tree

Roshan Pius [Wed, 15 Jul 2015 22:26:55 +0000 (22:26 +0000)]

am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
Handle exceptions when accessing Content providers.

commit | commitdiff | tree

Felipe Leme [Wed, 15 Jul 2015 22:26:47 +0000 (22:26 +0000)]

am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev

* commit '68fd7c798d213bbe304775b13d775ee868abb448':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.

commit | commitdiff | tree

Dianne Hackborn [Wed, 15 Jul 2015 22:26:42 +0000 (22:26 +0000)]

am d193916c: Merge "Fix build." into mnc-dev

* commit 'd193916c83015d54466ad998fb9373f15da754a7':
Fix build.

commit | commitdiff | tree

Jeff Brown [Wed, 15 Jul 2015 22:26:38 +0000 (22:26 +0000)]

am 76c4c666: Add USB port manager.

* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
Add USB port manager.

commit | commitdiff | tree

Jeff Brown [Wed, 15 Jul 2015 22:26:34 +0000 (22:26 +0000)]

am 2dbccc19: Clean up USB Manager dump.

* commit '2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
Clean up USB Manager dump.

commit | commitdiff | tree

Miao Wang [Wed, 15 Jul 2015 22:21:11 +0000 (22:21 +0000)]

Merge "fix BNNM docs" into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 15 Jul 2015 21:59:36 +0000 (21:59 +0000)]

am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev

* commit '6819696c0e00ce3805de66f13ec6deda2489fd32':
Give DCS permission needed to measure all users.

commit | commitdiff | tree

Jeff Sharkey [Wed, 15 Jul 2015 21:59:31 +0000 (21:59 +0000)]

am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev

* commit '350b99c0027902db22004ea037265349155d7c38':
Only send EXTRA_STACK for private intent.

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 21:59:27 +0000 (21:59 +0000)]

am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

* commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094':
Improve tracking of screen on reasons.

commit | commitdiff | tree

Svet Ganov [Wed, 15 Jul 2015 21:58:47 +0000 (21:58 +0000)]

Merge "Grant default permissions to the setup app robustly." into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 21:56:25 +0000 (21:56 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dev

commit | commitdiff | tree

Adrian Roos [Wed, 15 Jul 2015 21:56:12 +0000 (21:56 +0000)]

Merge "Show correct locked orientation on phones" into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 21:55:49 +0000 (21:55 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dev