OSDN Git Service

android-x86/frameworks-base.git
9 years agoam b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:09:19 +0000 (23:09 +0000)]
am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

* commit 'b879e7395fa9446952b840b1d576ff225b039774':
  MediaProjectionPermissionActivity: Fix NPE.

9 years agoam c974ac11: MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:01:26 +0000 (23:01 +0000)]
am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.

9 years agoMediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.

Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)

9 years agoam 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 4 Mar 2015 14:08:11 +0000 (14:08 +0000)]
am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '3b9e64f3265ad146da1b9f5b523c406acd041f59':
  Import translations. DO NOT MERGE

9 years agoam 63069cc9: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:08:03 +0000 (14:08 +0000)]
am 63069cc9: (-s ours) Import translations. DO NOT MERGE

* commit '63069cc985869fe06254e352ea63b361cb0d0917':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 4 Mar 2015 14:04:03 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:02:36 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:56:33 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:42:01 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 4 Mar 2015 13:41:21 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:36:32 +0000 (07:36 -0600)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:35:11 +0000 (05:35 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:29:01 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
Craig Mautner [Tue, 3 Mar 2015 21:03:28 +0000 (21:03 +0000)]
Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

9 years agoChange ActivityView startActivity state sequence
Craig Mautner [Fri, 27 Feb 2015 04:40:19 +0000 (20:40 -0800)]
Change ActivityView startActivity state sequence

Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.

This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.

This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.

Fixes bug 19147472.

Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244

9 years agoam 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo...
Joe Fernandez [Tue, 3 Mar 2015 06:42:39 +0000 (06:42 +0000)]
am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '1137ca03be9b9143c472d9adc51ea511cfd68a6b':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in manage...
Joe Fernandez [Tue, 3 Mar 2015 06:36:02 +0000 (06:36 +0000)]
am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile...
Joe Fernandez [Tue, 3 Mar 2015 06:29:33 +0000 (06:29 +0000)]
am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc referenc...
Joe Fernandez [Tue, 3 Mar 2015 06:22:42 +0000 (06:22 +0000)]
am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 06:18:54 +0000 (06:18 +0000)]
am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22

* commit '646c7cd6e81904791b7ecc7ab7750ffe4919371b':
  docs: support library updates for sdk 22

9 years agoam a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages....
Joe Fernandez [Tue, 3 Mar 2015 06:15:29 +0000 (06:15 +0000)]
am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.

9 years agoam a81ed3cd: docs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 06:13:41 +0000 (06:13 +0000)]
am a81ed3cd: docs: support library updates for sdk 22

* commit 'a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
  docs: support library updates for sdk 22

9 years agoMerge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
Joe Fernandez [Tue, 3 Mar 2015 06:11:49 +0000 (06:11 +0000)]
Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

9 years agodocs: support library updates for sdk 22
Rich Slogar [Tue, 3 Mar 2015 00:09:21 +0000 (16:09 -0800)]
docs: support library updates for sdk 22

Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c

9 years agoam ad334de5: am e0ce0f2c: docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 03:12:54 +0000 (03:12 +0000)]
am ad334de5: am e0ce0f2c: docs: platform revisions 5.1

* commit 'ad334de54a89ab755ef16aebf47bb16e287782bc':
  docs: platform revisions 5.1

9 years agoam e0ce0f2c: docs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 03:06:48 +0000 (03:06 +0000)]
am e0ce0f2c: docs: platform revisions 5.1

* commit 'e0ce0f2cc28720316902303209f923e699d604f7':
  docs: platform revisions 5.1

9 years agodocs: platform revisions 5.1
Rich Slogar [Tue, 3 Mar 2015 01:54:10 +0000 (17:54 -0800)]
docs: platform revisions 5.1

Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6

9 years agoam 8fe980e8: am 54643332: Merge "Doc change: Add diff report for API 22." into lmp...
Joe Fernandez [Tue, 3 Mar 2015 02:14:32 +0000 (02:14 +0000)]
am 8fe980e8: am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev

* commit '8fe980e803c6e20f799a12c08e54cadcbc39f6d1':
  Doc change: Add diff report for API 22.

9 years agoam 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 02:07:29 +0000 (02:07 +0000)]
am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev

* commit '546433328d0b017419bd3d5ff6ee5708645455db':
  Doc change: Add diff report for API 22.

9 years agoMerge "Doc change: Add diff report for API 22." into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 02:03:43 +0000 (02:03 +0000)]
Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev

9 years agoam a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22...
Joe Fernandez [Tue, 3 Mar 2015 01:54:52 +0000 (01:54 +0000)]
am a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

* commit 'a2bbdb96303c0fcac696ece07c27a49fbdd1f740':
  docs: update Android docs build to include API 22, Android 5.1

9 years agoam 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5...
Joe Fernandez [Tue, 3 Mar 2015 01:47:26 +0000 (01:47 +0000)]
am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

* commit '2ba57444e8368ab66ae43fe2304e39dc76fc64ff':
  docs: update Android docs build to include API 22, Android 5.1

9 years agoMerge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 01:42:40 +0000 (01:42 +0000)]
Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

9 years agoam 9b4a363d: am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk...
Rich Slogar [Tue, 3 Mar 2015 01:40:42 +0000 (01:40 +0000)]
am 9b4a363d: am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit '9b4a363d0d2043c009ce066ae99ddaf1054b5c8d':
  docs: sdk tools 24.1 update

9 years agoam 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 updat...
Rich Slogar [Tue, 3 Mar 2015 01:34:25 +0000 (01:34 +0000)]
am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit '3f3f842cc06e0103041e7dae4c3f9fbf1f7ab9c0':
  docs: sdk tools 24.1 update

9 years agoam d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp...
Rich Slogar [Tue, 3 Mar 2015 01:27:07 +0000 (01:27 +0000)]
am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit 'd54fe112a24ec3a692d35a4ccf1f73fa5caaaf5e':
  docs: sdk tools 24.1 update

9 years agoam be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs...
Joe Fernandez [Tue, 3 Mar 2015 01:24:50 +0000 (01:24 +0000)]
am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

* commit 'be34916d448e9cd04bebfa5bf3d61de0c8087d65':
  docs: Add Android 5.1 to the uses-sdk manifest docs

9 years agoMinor typo fixes in managed profile Javadoc reference pages.
Andrew Solovay [Tue, 3 Mar 2015 00:37:59 +0000 (16:37 -0800)]
Minor typo fixes in managed profile Javadoc reference pages.

See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c

9 years agoam 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 01:20:33 +0000 (01:20 +0000)]
am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit '2cbda290f66b5a17d3542ada26f7e91b3893f72d':
  docs: sdk tools 24.1 update

9 years agoam 46c588b9: am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1...
Joe Fernandez [Tue, 3 Mar 2015 01:16:52 +0000 (01:16 +0000)]
am 46c588b9: am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev

* commit '46c588b9394128a2da2c0ce3cea4eef05cea0f12':
  docs: Android 5.1 API Release notes (Lollipop MR1)

9 years agoam 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp...
Joe Fernandez [Tue, 3 Mar 2015 01:15:31 +0000 (01:15 +0000)]
am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

* commit '45ef73b4e97a0621ba5f26eef280f6550c81338d':
  docs: Add Android 5.1 to the uses-sdk manifest docs

9 years agoam 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 01:13:36 +0000 (01:13 +0000)]
am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit '69b58e74e087159ed5950632b4ab3738a841c633':
  docs: sdk tools 24.1 update

9 years agoMerge "docs: sdk tools 24.1 update" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 01:07:38 +0000 (01:07 +0000)]
Merge "docs: sdk tools 24.1 update" into lmp-docs

9 years agoam 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp...
Joe Fernandez [Tue, 3 Mar 2015 01:06:10 +0000 (01:06 +0000)]
am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev

* commit '5c6476aa507577422557d8434a7ce19937cfccfd':
  docs: Android 5.1 API Release notes (Lollipop MR1)

9 years agoMerge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 01:02:54 +0000 (01:02 +0000)]
Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

9 years agoMerge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
Joe Fernandez [Tue, 3 Mar 2015 00:56:42 +0000 (00:56 +0000)]
Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev

9 years agodocs: Add Android 5.1 to the uses-sdk manifest docs
Joe Fernandez [Tue, 3 Mar 2015 00:43:14 +0000 (16:43 -0800)]
docs: Add Android 5.1 to the uses-sdk manifest docs

Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267

9 years agodocs: update Android docs build to include API 22, Android 5.1
Joe Fernandez [Mon, 2 Mar 2015 23:53:38 +0000 (15:53 -0800)]
docs: update Android docs build to include API 22, Android 5.1

Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0

9 years agodocs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Fri, 27 Feb 2015 05:55:07 +0000 (21:55 -0800)]
docs: Android 5.1 API Release notes (Lollipop MR1)

Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0

9 years agoam 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into...
Shishir Agrawal [Mon, 2 Mar 2015 22:48:11 +0000 (22:48 +0000)]
am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

* commit '20a5df6205c3d57bfcb5b8e1454fb88c638c8ae3':
  Fix incorrect condition for sub id check.

9 years agoam bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Shishir Agrawal [Mon, 2 Mar 2015 22:38:43 +0000 (22:38 +0000)]
am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
  Fix incorrect condition for sub id check.

9 years agoMerge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Shishir Agrawal [Mon, 2 Mar 2015 22:32:16 +0000 (22:32 +0000)]
Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

9 years agoam 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters...
Deepanshu Gupta [Mon, 2 Mar 2015 20:03:37 +0000 (20:03 +0000)]
am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit '32dc37b72e787ca9323c01aa86e65694b6ff0cf7':
  Correct PorterDuff filters.

9 years agoam 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch...
Deepanshu Gupta [Mon, 2 Mar 2015 20:03:32 +0000 (20:03 +0000)]
am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit '4e87709b8b41a12d6caf2bd1110beed20e5b88e5':
  Fix codestyle for switch statements.

9 years agoam 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for State...
Deepanshu Gupta [Mon, 2 Mar 2015 20:03:28 +0000 (20:03 +0000)]
am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '6250030736e3ea25bacc92eba4c269dc6a6ee3db':
  Better error msg for StateList/Hexadecimal Color.

9 years agoam f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:56:27 +0000 (19:56 +0000)]
am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit 'f2c1c09683a5cfa23e8394fe5a10e84803f4168b':
  Correct PorterDuff filters.

9 years agoam 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements...
Deepanshu Gupta [Mon, 2 Mar 2015 19:56:24 +0000 (19:56 +0000)]
am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit '2022b0ffdd7c91e8435bc204ad9aedd658254166':
  Fix codestyle for switch statements.

9 years agoam aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadeci...
Deepanshu Gupta [Mon, 2 Mar 2015 19:56:18 +0000 (19:56 +0000)]
am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit 'aff0ec93f2a734a68673f1f7337533b6d93cb256':
  Better error msg for StateList/Hexadecimal Color.

9 years agoam 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:33 +0000 (19:52 +0000)]
am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
  Correct PorterDuff filters.

9 years agoam d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:29 +0000 (19:52 +0000)]
am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5':
  Fix codestyle for switch statements.

9 years agoam 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color...
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:25 +0000 (19:52 +0000)]
am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.

9 years agoam 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:47:29 +0000 (19:47 +0000)]
am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev

* commit '7b4caab1a87b659498d30af194ae511526c503ba':
  Add status bar time for 5.1

9 years agoam 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:51 +0000 (19:44 +0000)]
am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
  Correct PorterDuff filters.

9 years agoam 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:47 +0000 (19:44 +0000)]
am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
  Fix codestyle for switch statements.

9 years agoam 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:43 +0000 (19:44 +0000)]
am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.

9 years agoam 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:41:59 +0000 (19:41 +0000)]
am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev

* commit '07d453fa091ab407864d474f9bf2a5167686010a':
  Add status bar time for 5.1

9 years agoMerge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:40:12 +0000 (19:40 +0000)]
Merge "Correct PorterDuff filters." into lmp-dev

9 years agoMerge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:37:30 +0000 (19:37 +0000)]
Merge "Fix codestyle for switch statements." into lmp-dev

9 years agoMerge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:36:57 +0000 (19:36 +0000)]
Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

9 years agoMerge "Add status bar time for 5.1" into lmp-mr1-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:26:14 +0000 (19:26 +0000)]
Merge "Add status bar time for 5.1" into lmp-mr1-dev

9 years agoam 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015...
Joe Fernandez [Mon, 2 Mar 2015 18:18:46 +0000 (18:18 +0000)]
am 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '4725bec1ff03d8be859c52dba6ac663016c2295c':
  docs: March 2015 Dashboard update

9 years agoam 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 18:10:54 +0000 (18:10 +0000)]
am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '8243b74f7f19d57455f7ff9188f539d0361139db':
  docs: March 2015 Dashboard update

9 years agoam 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 18:04:39 +0000 (18:04 +0000)]
am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '6a0c808487392f6cd8d62ad4abb51c0f077ace0f':
  docs: March 2015 Dashboard update

9 years agoam 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:14:51 +0000 (17:14 +0000)]
am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '9b94a5399845efc9d52ebf37e8fde320885c07c8':
  docs: March 2015 Dashboard update

9 years agoam 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:09:01 +0000 (17:09 +0000)]
am 97a1173b: docs: March 2015 Dashboard update

* commit '97a1173b63be900ab5aed694e8022c60f3817fa0':
  docs: March 2015 Dashboard update

9 years agodocs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 16:53:54 +0000 (08:53 -0800)]
docs: March 2015 Dashboard update

Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361

9 years agoam fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 2 Mar 2015 14:22:52 +0000 (14:22 +0000)]
am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 2 Mar 2015 14:18:14 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoam 6b5b052e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:16:57 +0000 (14:16 +0000)]
am 6b5b052e: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:15:22 +0000 (06:15 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:09:28 +0000 (06:09 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 2 Mar 2015 13:52:27 +0000 (13:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 2 Mar 2015 13:52:06 +0000 (13:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:48:34 +0000 (07:48 -0600)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:48:19 +0000 (05:48 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:42:09 +0000 (05:42 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam 7aa654bc: am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle...
Rich Slogar [Fri, 27 Feb 2015 23:18:32 +0000 (23:18 +0000)]
am 7aa654bc: am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '7aa654bc19699ea6eb7bed74c9dd503e91efb6a1':
  docs: gradle plugin version update

9 years agoam 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin versio...
Rich Slogar [Fri, 27 Feb 2015 23:10:27 +0000 (23:10 +0000)]
am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '37f207e118f1de7442a8874f7ebc6db643d0edcc':
  docs: gradle plugin version update

9 years agodocs: sdk tools 24.1 update
Rich Slogar [Thu, 26 Feb 2015 23:10:54 +0000 (15:10 -0800)]
docs: sdk tools 24.1 update

Change-Id: I995c1012c22b8b6fa45c4cfd33f90b8b82ddb0eb

9 years agoam 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update...
Rich Slogar [Fri, 27 Feb 2015 22:50:34 +0000 (22:50 +0000)]
am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '191131d4494f0b6c51463ae9e771672bad5c970a':
  docs: gradle plugin version update

9 years agoam 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:43:42 +0000 (22:43 +0000)]
am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '50e8b020f69687f11a0abce4ec5312697f9a1449':
  docs: gradle plugin version update

9 years agoam a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:37:17 +0000 (22:37 +0000)]
am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit 'a83f64451d55882366491e66c7479f194e0625ea':
  docs: gradle plugin version update

9 years agoMerge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:31:32 +0000 (22:31 +0000)]
Merge "docs: gradle plugin version update" into lmp-docs

9 years agodocs: gradle plugin version update
Rich Slogar [Mon, 23 Feb 2015 18:22:22 +0000 (10:22 -0800)]
docs: gradle plugin version update

b.android 153270

Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc

9 years agoam 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add...
Luan Nguyen [Fri, 27 Feb 2015 17:10:34 +0000 (17:10 +0000)]
am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit '4490d6b5706bd839896b3760954a08cb4dc0575d':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 17:10:31 +0000 (17:10 +0000)]
am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit 'a667bcd688a35f7c9184452ffe7eb4bfe2989bf2':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented...
Andrew Solovay [Fri, 27 Feb 2015 17:10:27 +0000 (17:10 +0000)]
am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit 'f8ceaa6b557f59fdd654ce63e35f9b73c0be33b8':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable...
Luan Nguyen [Fri, 27 Feb 2015 17:00:18 +0000 (17:00 +0000)]
am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit 'dedba01ac8b85d535171a910aa6b72ea9ce4498c':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 17:00:13 +0000 (17:00 +0000)]
am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit 'd4cdf18e1c763c2aaedbb4f0cab3657db2adc097':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub...
Andrew Solovay [Fri, 27 Feb 2015 17:00:10 +0000 (17:00 +0000)]
am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit '3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal