OSDN Git Service

android-x86/frameworks-base.git
9 years agoam a46688d1: am 33870f87: am 25fc117a: Merge "Remove unused asset, prune large rarely...
Alan Viverette [Wed, 27 May 2015 20:56:15 +0000 (20:56 +0000)]
am a46688d1: am 33870f87: am 25fc117a: Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev

* commit 'a46688d18dec0ff960783039ddad7d441b75a59f':
  Remove unused asset, prune large rarely-used Holo assets from preload

9 years agoam d27a1081: am fb5dae30: am 8141d6e1: Merge "Use DeviceDefault (dark) theme for...
Alan Viverette [Wed, 27 May 2015 20:56:09 +0000 (20:56 +0000)]
am d27a1081: am fb5dae30: am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

* commit 'd27a10817e80909172bf836354cb3f81e317ce5e':
  Use DeviceDefault (dark) theme for PrintActivity

9 years agoam 43535469: am 455152bc: am 1ec5e308: Merge "Fix assert when dumping view at 0 alpha...
Chris Craik [Wed, 27 May 2015 20:56:04 +0000 (20:56 +0000)]
am 43535469: am 455152bc: am 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

* commit '4353546951612db4c0999df686d630bb193003f6':
  Fix assert when dumping view at 0 alpha

9 years agoam 31cf6e44: am b6483c5e: am 1e6d566c: Merge "Fix GL texture binding for TextureViews...
Chris Craik [Wed, 27 May 2015 20:55:58 +0000 (20:55 +0000)]
am 31cf6e44: am b6483c5e: am 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev

* commit '31cf6e44b7501fc2179082b9a0eb51283e2cf50d':
  Fix GL texture binding for TextureViews

9 years agoam a543e6b9: am 9e3743e8: am 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameter...
Alex Klyubin [Wed, 27 May 2015 20:55:53 +0000 (20:55 +0000)]
am a543e6b9: am 9e3743e8: am 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev

* commit 'a543e6b98ebe91d130d87e476b5e29f5cb06a808':
  Fix typo in Javadocs of KeyGenParameterSpec.

9 years agoam d8e79685: am 838cd2e4: am 5ccfe51d: Merge "[LockSettings] migrate password attempt...
Andres Morales [Wed, 27 May 2015 20:55:47 +0000 (20:55 +0000)]
am d8e79685: am 838cd2e4: am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

* commit 'd8e796855fd346af1944e95d70020caeae40fad1':
  [LockSettings] migrate password attempt throttling to hardware

9 years agoam 5d49caa3: am bd24ba18: am 77aa9afe: Merge "Fallback to priority activity if prefer...
Julia Reynolds [Wed, 27 May 2015 20:55:41 +0000 (20:55 +0000)]
am 5d49caa3: am bd24ba18: am 77aa9afe: Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

* commit '5d49caa32330368eff04bc69c4272c37c3fa880b':
  Fallback to priority activity if preferred activity not available.

9 years agoam 08064a63: am d3972f39: am d0699fa5: Merge "Avoid strict mode violation during...
Alan Viverette [Wed, 27 May 2015 20:55:35 +0000 (20:55 +0000)]
am 08064a63: am d3972f39: am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

* commit '08064a63dc0295f5ae6c344a75e8c61af2376e29':
  Avoid strict mode violation during saveAttributeData

9 years agoam 33870f87: am 25fc117a: Merge "Remove unused asset, prune large rarely-used Holo...
Alan Viverette [Wed, 27 May 2015 20:41:13 +0000 (20:41 +0000)]
am 33870f87: am 25fc117a: Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev

* commit '33870f8765dd0533a8b9cc5dee9f72c7a24a6494':
  Remove unused asset, prune large rarely-used Holo assets from preload

9 years agoam fb5dae30: am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity...
Alan Viverette [Wed, 27 May 2015 20:41:09 +0000 (20:41 +0000)]
am fb5dae30: am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

* commit 'fb5dae3024b0a50b16a34a9e41f311dfaa1e192f':
  Use DeviceDefault (dark) theme for PrintActivity

9 years agoam 455152bc: am 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev
Chris Craik [Wed, 27 May 2015 20:41:04 +0000 (20:41 +0000)]
am 455152bc: am 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

* commit '455152bce2f99afade6ae9658bcf83673152bde8':
  Fix assert when dumping view at 0 alpha

9 years agoam b6483c5e: am 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev
Chris Craik [Wed, 27 May 2015 20:40:59 +0000 (20:40 +0000)]
am b6483c5e: am 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev

* commit 'b6483c5e736cf9a7f27bfdd019f063156617833d':
  Fix GL texture binding for TextureViews

9 years agoam 9e3743e8: am 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into...
Alex Klyubin [Wed, 27 May 2015 20:40:53 +0000 (20:40 +0000)]
am 9e3743e8: am 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev

* commit '9e3743e82c4d1457190de4982068d1c79d771cde':
  Fix typo in Javadocs of KeyGenParameterSpec.

9 years agoam 838cd2e4: am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling...
Andres Morales [Wed, 27 May 2015 20:40:48 +0000 (20:40 +0000)]
am 838cd2e4: am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

* commit '838cd2e467690492e89f5f53f60b3b4dc42c720b':
  [LockSettings] migrate password attempt throttling to hardware

9 years agoam bd24ba18: am 77aa9afe: Merge "Fallback to priority activity if preferred activity...
Julia Reynolds [Wed, 27 May 2015 20:40:43 +0000 (20:40 +0000)]
am bd24ba18: am 77aa9afe: Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

* commit 'bd24ba1819220547b17fa3570212b0054cbeb5c1':
  Fallback to priority activity if preferred activity not available.

9 years agoam d3972f39: am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData...
Alan Viverette [Wed, 27 May 2015 20:40:38 +0000 (20:40 +0000)]
am d3972f39: am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

* commit 'd3972f39b862252f3aee443f0fdc23e9ac4882cf':
  Avoid strict mode violation during saveAttributeData

9 years agoam 41964750: am b343bfd9: am 2b919d4f: Merge "Add getCallingUid() to RecognitionServi...
Cedric Ho [Wed, 27 May 2015 20:31:11 +0000 (20:31 +0000)]
am 41964750: am b343bfd9: am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev

* commit '41964750d30cee08b75470abf3f09341f75b069a':
  Add getCallingUid() to RecognitionService.Callback.

9 years agoam 25fc117a: Merge "Remove unused asset, prune large rarely-used Holo assets from...
Alan Viverette [Wed, 27 May 2015 20:23:34 +0000 (20:23 +0000)]
am 25fc117a: Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev

* commit '25fc117a358ecef3b97787c0847265d7f363ccae':
  Remove unused asset, prune large rarely-used Holo assets from preload

9 years agoam 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
Alan Viverette [Wed, 27 May 2015 20:23:30 +0000 (20:23 +0000)]
am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

* commit '8141d6e1509a586e2954fbece04e64aaa02092a2':
  Use DeviceDefault (dark) theme for PrintActivity

9 years agoam 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev
Chris Craik [Wed, 27 May 2015 20:23:23 +0000 (20:23 +0000)]
am 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

* commit '1ec5e308a913cd0c54d58fd797274485664781c1':
  Fix assert when dumping view at 0 alpha

9 years agoam 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev
Chris Craik [Wed, 27 May 2015 20:23:18 +0000 (20:23 +0000)]
am 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev

* commit '1e6d566c5f8500e3639a8f8ceebf0226c07efc13':
  Fix GL texture binding for TextureViews

9 years agoam 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
Alex Klyubin [Wed, 27 May 2015 20:23:14 +0000 (20:23 +0000)]
am 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev

* commit '06c88b60efd12d3e81c7a9c53d8b995e23d04c5a':
  Fix typo in Javadocs of KeyGenParameterSpec.

9 years agoam 3618bf00: am 89745e6f: am 302abd22: Merge "Enable swapBuffersWithDamage by default...
John Reck [Wed, 27 May 2015 20:23:10 +0000 (20:23 +0000)]
am 3618bf00: am 89745e6f: am 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev

* commit '3618bf0006160429d89cc883643c9093262f8ad5':
  Enable swapBuffersWithDamage by default

9 years agoam 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware...
Andres Morales [Wed, 27 May 2015 20:23:05 +0000 (20:23 +0000)]
am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

* commit '5ccfe51d8b9ae4f73a3b0fdb553b807cf5691582':
  [LockSettings] migrate password attempt throttling to hardware

9 years agoam dc870638: am 1ed681dd: am 165229ba: Merge "Add workaround for measuring stacked...
Alan Viverette [Wed, 27 May 2015 20:23:03 +0000 (20:23 +0000)]
am dc870638: am 1ed681dd: am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev

* commit 'dc870638ff53a3dd1242c21645156166b815add0':
  Add workaround for measuring stacked button bar layout

9 years agoam 77aa9afe: Merge "Fallback to priority activity if preferred activity not available...
Julia Reynolds [Wed, 27 May 2015 20:22:59 +0000 (20:22 +0000)]
am 77aa9afe: Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

* commit '77aa9afe0c67ca7285ed81664571f3d6f567eb9b':
  Fallback to priority activity if preferred activity not available.

9 years agoam d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev
Alan Viverette [Wed, 27 May 2015 20:22:55 +0000 (20:22 +0000)]
am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

* commit 'd0699fa5697ba43c64c142ee67b245e0a346acfe':
  Avoid strict mode violation during saveAttributeData

9 years agoam b343bfd9: am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback...
Cedric Ho [Wed, 27 May 2015 20:20:18 +0000 (20:20 +0000)]
am b343bfd9: am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev

* commit 'b343bfd95a70b77b4d32dd777288b66ea5b024aa':
  Add getCallingUid() to RecognitionService.Callback.

9 years agoMerge "Remove unused asset, prune large rarely-used Holo assets from preload" into...
Alan Viverette [Wed, 27 May 2015 19:59:11 +0000 (19:59 +0000)]
Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev

9 years agoRemove unused asset, prune large rarely-used Holo assets from preload
Alan Viverette [Wed, 27 May 2015 19:55:49 +0000 (12:55 -0700)]
Remove unused asset, prune large rarely-used Holo assets from preload

Bug: 21352447
Change-Id: I4ad6bc99edf5af0a665827702457925339204f97

9 years agoMerge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
Alan Viverette [Wed, 27 May 2015 19:26:25 +0000 (19:26 +0000)]
Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

9 years agoMerge "Fix assert when dumping view at 0 alpha" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:43 +0000 (19:22 +0000)]
Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

9 years agoMerge "Fix GL texture binding for TextureViews" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:42 +0000 (19:22 +0000)]
Merge "Fix GL texture binding for TextureViews" into mnc-dev

9 years agoUse DeviceDefault (dark) theme for PrintActivity
Alan Viverette [Wed, 27 May 2015 19:17:26 +0000 (12:17 -0700)]
Use DeviceDefault (dark) theme for PrintActivity

Bug: 21433656
Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6

9 years agoMerge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
Alex Klyubin [Wed, 27 May 2015 18:46:55 +0000 (18:46 +0000)]
Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev

9 years agoMerge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev
Andres Morales [Wed, 27 May 2015 18:37:21 +0000 (18:37 +0000)]
Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

9 years agoMerge "Fallback to priority activity if preferred activity not available." into mnc-dev
Julia Reynolds [Wed, 27 May 2015 18:28:40 +0000 (18:28 +0000)]
Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

9 years agoFix assert when dumping view at 0 alpha
Chris Craik [Wed, 27 May 2015 18:28:14 +0000 (11:28 -0700)]
Fix assert when dumping view at 0 alpha

bug:21461177

Change-Id: Ib4aba7b9641254012471da44aa804813b9679423

9 years agoFix GL texture binding for TextureViews
Chris Craik [Wed, 27 May 2015 18:06:21 +0000 (11:06 -0700)]
Fix GL texture binding for TextureViews

bug:21431334

Should be explicitly passing target through, to ensure
GL_EXTERNAL_OES textures are bound correctly.

Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b

9 years agoam 89745e6f: am 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev
John Reck [Wed, 27 May 2015 18:01:15 +0000 (18:01 +0000)]
am 89745e6f: am 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev

* commit '89745e6f451bfa2071de066e665f4a2bc75738bf':
  Enable swapBuffersWithDamage by default

9 years agoam 1ed681dd: am 165229ba: Merge "Add workaround for measuring stacked button bar...
Alan Viverette [Wed, 27 May 2015 18:01:09 +0000 (18:01 +0000)]
am 1ed681dd: am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev

* commit '1ed681dd2a3daa0cc109177703f2433ec354de58':
  Add workaround for measuring stacked button bar layout

9 years agoam 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
Cedric Ho [Wed, 27 May 2015 18:01:09 +0000 (18:01 +0000)]
am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev

* commit '2b919d4f69807528a11e38aee1a87507249d8319':
  Add getCallingUid() to RecognitionService.Callback.

9 years agoMerge "Avoid strict mode violation during saveAttributeData" into mnc-dev
Alan Viverette [Wed, 27 May 2015 18:00:14 +0000 (18:00 +0000)]
Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

9 years agoMerge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
Cedric Ho [Wed, 27 May 2015 17:46:40 +0000 (17:46 +0000)]
Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev

9 years agoam 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev
John Reck [Wed, 27 May 2015 17:42:56 +0000 (17:42 +0000)]
am 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev

* commit '302abd22468367bcdeb1f85ea8014fe05ed95610':
  Enable swapBuffersWithDamage by default

9 years agoam 165229ba: Merge "Add workaround for measuring stacked button bar layout" into...
Alan Viverette [Wed, 27 May 2015 17:42:52 +0000 (17:42 +0000)]
am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev

* commit '165229ba417fd77ccbb4feb3bc3c664d2cac7ce5':
  Add workaround for measuring stacked button bar layout

9 years agoMerge "Enable swapBuffersWithDamage by default" into mnc-dev
John Reck [Wed, 27 May 2015 17:39:17 +0000 (17:39 +0000)]
Merge "Enable swapBuffersWithDamage by default" into mnc-dev

9 years agoMerge "Add workaround for measuring stacked button bar layout" into mnc-dev
Alan Viverette [Wed, 27 May 2015 17:30:44 +0000 (17:30 +0000)]
Merge "Add workaround for measuring stacked button bar layout" into mnc-dev

9 years agoEnable swapBuffersWithDamage by default
John Reck [Wed, 27 May 2015 17:26:10 +0000 (10:26 -0700)]
Enable swapBuffersWithDamage by default

Bug: 20761426

Change-Id: I520e60ca4f182dea590bc86eebd522e1db7a018a

9 years agoAdd workaround for measuring stacked button bar layout
Alan Viverette [Wed, 27 May 2015 17:28:05 +0000 (10:28 -0700)]
Add workaround for measuring stacked button bar layout

Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd

9 years agoam 9d5c9f86: (-s ours) am f509067d: (-s ours) am 07491cb9: (-s ours) Merge "Import...
Geoff Mendal [Wed, 27 May 2015 17:26:59 +0000 (17:26 +0000)]
am 9d5c9f86: (-s ours) am f509067d: (-s ours) am 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9d5c9f8683f2256c168ef2eefa270e7e7387d123':
  Import translations. DO NOT MERGE

9 years agoam f509067d: (-s ours) am 07491cb9: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 27 May 2015 17:09:49 +0000 (17:09 +0000)]
am f509067d: (-s ours) am 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 27 May 2015 16:54:23 +0000 (16:54 +0000)]
am 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '07491cb93c66c0f4a1680dc07eca22dab5455c12':
  Import translations. DO NOT MERGE

9 years agoAdd getCallingUid() to RecognitionService.Callback.
Cedric Ho [Wed, 27 May 2015 16:51:19 +0000 (09:51 -0700)]
Add getCallingUid() to RecognitionService.Callback.

Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07

9 years agoam c1c98e6c: am 222a345c: am 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am...
Mike Colagrosso [Wed, 27 May 2015 16:46:06 +0000 (16:46 +0000)]
am c1c98e6c: am 222a345c: am 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit 'c1c98e6c3975114a3eface7ab070e98c5b9a05f6':
  Android Training: Add missing word

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 27 May 2015 16:41:15 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam 222a345c: am 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge...
Mike Colagrosso [Wed, 27 May 2015 16:38:15 +0000 (16:38 +0000)]
am 222a345c: am 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '222a345c9697f6c57a942187f355e04c5031dda9':
  Android Training: Add missing word

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 27 May 2015 16:35:53 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I75401e1e66e9793ea4be891b4ef6afcf9811184a
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 27 May 2015 16:32:06 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 27 May 2015 16:28:55 +0000 (09:28 -0700)]
Import translations. DO NOT MERGE

Change-Id: I82cb21bb716bd557bcdab22480b306d97d07e7e9
Auto-generated-cl: translation import

9 years agoam 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Train...
Mike Colagrosso [Wed, 27 May 2015 16:24:27 +0000 (16:24 +0000)]
am 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '6ffab1bd65d2b5cc9e2944712058cb42babaa76b':
  Android Training: Add missing word

9 years agoam f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add...
Mike Colagrosso [Wed, 27 May 2015 16:06:48 +0000 (16:06 +0000)]
am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit 'f77b748caa2795296866c1c9c30385819ffca835':
  Android Training: Add missing word

9 years agoam 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word...
Mike Colagrosso [Wed, 27 May 2015 15:53:03 +0000 (15:53 +0000)]
am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '31a48820aa858770cb1f1b3ce32a550565c83546':
  Android Training: Add missing word

9 years agoam 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:38:37 +0000 (15:38 +0000)]
am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '1c673f9abe8b6d931456ce6709c9b00cdb5d11ca':
  Android Training: Add missing word

9 years agoam 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:23:36 +0000 (15:23 +0000)]
am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '6eea30c422811da1b989500147afb82b5f2d45e0':
  Android Training: Add missing word

9 years agoMerge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:04:47 +0000 (15:04 +0000)]
Merge "Android Training: Add missing word" into lmp-docs

9 years agoFallback to priority activity if preferred activity not available.
Julia Reynolds [Wed, 27 May 2015 13:01:22 +0000 (09:01 -0400)]
Fallback to priority activity if preferred activity not available.

Bug: 21434199
Change-Id: I1f268700219dea7f9ed02bda320923f49a5a3457

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 27 May 2015 12:25:06 +0000 (07:25 -0500)]
Import translations. DO NOT MERGE

Change-Id: I51e9176740832e7d46efd122b296e2aaa5337ddc
Auto-generated-cl: translation import

9 years agoam 0c4b8cdd: am 056e1d77: am 81c73e12: Merge "Clear caller identity before setting...
Sudheer Shanka [Wed, 27 May 2015 12:02:08 +0000 (12:02 +0000)]
am 0c4b8cdd: am 056e1d77: am 81c73e12: Merge "Clear caller identity before setting all the user restrictions." into mnc-dev

* commit '0c4b8cdd323165cab2e8990f2aec393e4fcda279':
  Clear caller identity before setting all the user restrictions.

9 years agoam 056e1d77: am 81c73e12: Merge "Clear caller identity before setting all the user...
Sudheer Shanka [Wed, 27 May 2015 11:48:36 +0000 (11:48 +0000)]
am 056e1d77: am 81c73e12: Merge "Clear caller identity before setting all the user restrictions." into mnc-dev

* commit '056e1d775660a8c87126a97d9af09cbdbcd7c5b4':
  Clear caller identity before setting all the user restrictions.

9 years agoam 81c73e12: Merge "Clear caller identity before setting all the user restrictions...
Sudheer Shanka [Wed, 27 May 2015 11:34:19 +0000 (11:34 +0000)]
am 81c73e12: Merge "Clear caller identity before setting all the user restrictions." into mnc-dev

* commit '81c73e121ef2ff44a3916628d9ff11385db85bd6':
  Clear caller identity before setting all the user restrictions.

9 years agoMerge "Clear caller identity before setting all the user restrictions." into mnc-dev
Sudheer Shanka [Wed, 27 May 2015 11:25:31 +0000 (11:25 +0000)]
Merge "Clear caller identity before setting all the user restrictions." into mnc-dev

9 years agoam 2a1a327e: am 83d9c9fd: am 0f22ec97: am 21531bce: am 57141700: am 0f771240: am...
Wale Ogunwale [Wed, 27 May 2015 07:03:49 +0000 (07:03 +0000)]
am 2a1a327e: am 83d9c9fd: am 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '2a1a327ef6285f9aef7a65bf16940f6607500c10':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 7ecc94ba: am 505ef515: am 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks...
Johan Euphrosine [Wed, 27 May 2015 06:59:36 +0000 (06:59 +0000)]
am 7ecc94ba: am 505ef515: am 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

* commit '7ecc94bae523a7312841ca34bdfefa1d498db9de':
  frameworks/base/docs/ndk: add files in reference_toc

9 years agoam 83d9c9fd: am 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am...
Wale Ogunwale [Wed, 27 May 2015 06:49:53 +0000 (06:49 +0000)]
am 83d9c9fd: am 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '83d9c9fd6716b02a7bfce2ed2e5a83e91ee987a3':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am...
Wale Ogunwale [Wed, 27 May 2015 06:35:01 +0000 (06:35 +0000)]
am 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '0f22ec9777d94c39364d340b454e99c44cac7d9a':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am...
Wale Ogunwale [Wed, 27 May 2015 06:21:15 +0000 (06:21 +0000)]
am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '21531bce0e8848311c7f8caceeee3b988c7396f4':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdow...
Wale Ogunwale [Wed, 27 May 2015 06:06:51 +0000 (06:06 +0000)]
am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '5714170091065bb51f33c8f3ce272db07f69a21b':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunni...
Wale Ogunwale [Wed, 27 May 2015 05:52:33 +0000 (05:52 +0000)]
am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '0f7712407d96a847845b10eef34d9a259c687533':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 4bf4c840: am dfbb9c2f: am ea8ace5e: am 7f0eaefe: am c2e34345: Doc change: update...
Dirk Dougherty [Wed, 27 May 2015 05:47:21 +0000 (05:47 +0000)]
am 4bf4c840: am dfbb9c2f: am ea8ace5e: am 7f0eaefe: am c2e34345: Doc change: update gcm logo in card image.

* commit '4bf4c840889bba7dca49314ea87dfe824ac09c9b':
  Doc change: update gcm logo in card image.

9 years agoam 8950e7fb: am ae21c18f: am bf3afdb8: am 3b1c69cf: am ea1f6fb3: Doc change: edits...
Dirk Dougherty [Wed, 27 May 2015 05:47:14 +0000 (05:47 +0000)]
am 8950e7fb: am ae21c18f: am bf3afdb8: am 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to data binding guide.

* commit '8950e7fb671727f592851209502fc459af1f5b7c':
  Doc change: edits and fixes to data binding guide.

9 years agoam 98aea8a4: am 1794da44: am 617c2999: am 63c2b34b: am f47dc2cc: Merge "docs: M Previ...
Joe Fernandez [Wed, 27 May 2015 05:47:09 +0000 (05:47 +0000)]
am 98aea8a4: am 1794da44: am 617c2999: am 63c2b34b: am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs

* commit '98aea8a4a7afc861e68b4991fe2d2cd4b53c935e':
  docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC

9 years agoam ad70b1cc: am a8680703: am dadb9cb3: am 1b1fce80: am 7311d2e2: Merge "Docs: "Tombst...
David Friedman [Wed, 27 May 2015 05:47:03 +0000 (05:47 +0000)]
am ad70b1cc: am a8680703: am dadb9cb3: am 1b1fce80: am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs

* commit 'ad70b1cc9fac2c69bb497ff94370713e4c38f84f':
  Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.

9 years agoam ba1dcb38: am 0c1be545: am 64aa569e: Merge "Merge commit \'001701ae\' into manualme...
Dirk Dougherty [Wed, 27 May 2015 05:46:56 +0000 (05:46 +0000)]
am ba1dcb38: am 0c1be545: am 64aa569e: Merge "Merge commit \'001701ae\' into manualmergetoday" into mnc-dev

* commit 'ba1dcb38eeaeb74637819b8570b7be39d0413720':
  Doc change: move data binding library to tools tab.

9 years agoam 610bf0b2: am 1b9c3dda: am 62267e0f: Merge "don\'t report missing launch intent...
Guang Zhu [Wed, 27 May 2015 05:46:51 +0000 (05:46 +0000)]
am 610bf0b2: am 1b9c3dda: am 62267e0f: Merge "don\'t report missing launch intent as failure" into mnc-dev

* commit '610bf0b2833d9827a55345923a3292ec384cc7d4':
  don't report missing launch intent as failure

9 years agoam 505ef515: am 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk...
Johan Euphrosine [Wed, 27 May 2015 05:43:10 +0000 (05:43 +0000)]
am 505ef515: am 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

* commit '505ef51572812a959b2e878468950de7b20a3a9e':
  frameworks/base/docs/ndk: add files in reference_toc

9 years agoam bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesse...
Wale Ogunwale [Wed, 27 May 2015 05:35:52 +0000 (05:35 +0000)]
am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit 'bf0439a7e8824b4288f52c952a6808c8bdaf3235':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam dfbb9c2f: am ea8ace5e: am 7f0eaefe: am c2e34345: Doc change: update gcm logo in...
Dirk Dougherty [Wed, 27 May 2015 05:32:59 +0000 (05:32 +0000)]
am dfbb9c2f: am ea8ace5e: am 7f0eaefe: am c2e34345: Doc change: update gcm logo in card image.

* commit 'dfbb9c2fb46dca8918acf213ef9a6524caa4479c':
  Doc change: update gcm logo in card image.

9 years agoam ae21c18f: am bf3afdb8: am 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to...
Dirk Dougherty [Wed, 27 May 2015 05:32:52 +0000 (05:32 +0000)]
am ae21c18f: am bf3afdb8: am 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to data binding guide.

* commit 'ae21c18f4c4b850d2a58450b74fdfb960b59f8d5':
  Doc change: edits and fixes to data binding guide.

9 years agoam 1794da44: am 617c2999: am 63c2b34b: am f47dc2cc: Merge "docs: M Preview - fix...
Joe Fernandez [Wed, 27 May 2015 05:32:36 +0000 (05:32 +0000)]
am 1794da44: am 617c2999: am 63c2b34b: am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs

* commit '1794da44a65d19ca741e392a5eafc164997ad062':
  docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC

9 years agoam a8680703: am dadb9cb3: am 1b1fce80: am 7311d2e2: Merge "Docs: "Tombstone" for...
David Friedman [Wed, 27 May 2015 05:32:31 +0000 (05:32 +0000)]
am a8680703: am dadb9cb3: am 1b1fce80: am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs

* commit 'a86807037d4fef0f77f7956d29a96f3838dad163':
  Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.

9 years agoam 0c1be545: am 64aa569e: Merge "Merge commit \'001701ae\' into manualmergetoday...
Dirk Dougherty [Wed, 27 May 2015 05:32:21 +0000 (05:32 +0000)]
am 0c1be545: am 64aa569e: Merge "Merge commit \'001701ae\' into manualmergetoday" into mnc-dev

* commit '0c1be545c6429d259bf33987615a6aad786285f7':
  Doc change: move data binding library to tools tab.

9 years agoam 1b9c3dda: am 62267e0f: Merge "don\'t report missing launch intent as failure"...
Guang Zhu [Wed, 27 May 2015 05:32:16 +0000 (05:32 +0000)]
am 1b9c3dda: am 62267e0f: Merge "don\'t report missing launch intent as failure" into mnc-dev

* commit '1b9c3dda279065ec4d82543dc032d2e7f2babd1e':
  don't report missing launch intent as failure

9 years agoam 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files...
Johan Euphrosine [Wed, 27 May 2015 05:26:17 +0000 (05:26 +0000)]
am 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

* commit '625119f369ace53851f6042506a8d31c2c13cbd6':
  frameworks/base/docs/ndk: add files in reference_toc

9 years agoam 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with...
Wale Ogunwale [Wed, 27 May 2015 05:17:55 +0000 (05:17 +0000)]
am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '02f3cf79989b202a45753ad74653d48f7d73c73d':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc...
Johan Euphrosine [Wed, 27 May 2015 05:10:27 +0000 (05:10 +0000)]
am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

* commit '54856cc75f5dbbfa18aa0f84b69fbcaad7c25cc4':
  frameworks/base/docs/ndk: add files in reference_toc

9 years agoam 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission...
Wale Ogunwale [Wed, 27 May 2015 05:03:29 +0000 (05:03 +0000)]
am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '523a19bf3df202c58369279fc4e538e9e342c1e7':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc...
Johan Euphrosine [Wed, 27 May 2015 04:57:05 +0000 (04:57 +0000)]
am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

* commit 'a08a26c661d8cd31f3465ff8fa7356bcdad996a8':
  frameworks/base/docs/ndk: add files in reference_toc

9 years agoam c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
Wale Ogunwale [Wed, 27 May 2015 04:50:11 +0000 (04:50 +0000)]
am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit 'c9a0c0b90773fded6c251646300231f67c891b78':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoMerge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs
Johan Euphrosine [Wed, 27 May 2015 04:43:21 +0000 (04:43 +0000)]
Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs