182267 Commits

Author SHA1 Message Date
Todd Volkert
f4f9a3015e Merge "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it." 2015-02-12 23:35:59 +00:00
Casey Burkhardt
032559650e am 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev
automerge: d1a5b5d

* commit 'd1a5b5dc07dc3798ae13a5a9538b5e5bbbeb8058':
  Support circular magnification frame on circular devices
2015-02-12 23:31:15 +00:00
Casey Burkhardt
d1a5b5dc07 am 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev
* commit '6f2dd8a9b195a2bc8538820d8685a4a0576964f9':
  Support circular magnification frame on circular devices
2015-02-12 23:28:30 +00:00
Todd Volkert
0653f2596f Increase visibility of Transition.areValuesChanged() to protected to allow
subclasses outside the android.transition package to override it.

Change-Id: Ib6a5502827e734de7494958b510afc9ddb80dffe
2015-02-12 15:27:57 -08:00
Geoff Mendal
1da54032e8 am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge: 6c02d92  -s ours

* commit '6c02d9239885a529d4b160aa3938b14c61fbc3fd':
  Import translations. DO NOT MERGE
2015-02-12 23:25:38 +00:00
Geoff Mendal
cacf90e515 am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge: f6ee5db  -s ours

* commit 'f6ee5dbc5efc90467dd46c5317807676fdaf8ae6':
  Import translations. DO NOT MERGE
2015-02-12 23:24:19 +00:00
Casey Burkhardt
6f2dd8a9b1 Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev 2015-02-12 23:23:45 +00:00
Geoff Mendal
6c02d92398 am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '77c5de0d68fb1e40e01082cf97758b2d35bfca91':
  Import translations. DO NOT MERGE
2015-02-12 23:22:42 +00:00
Geoff Mendal
f6ee5dbc5e am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43':
  Import translations. DO NOT MERGE
2015-02-12 23:22:38 +00:00
John Spurlock
07137c3440 am 1be4b702: am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '1be4b702f531363903b46a88fc3d1603fb19c3ef':
  NoMan: Initialize filter value reported to listeners.
2015-02-12 23:19:03 +00:00
Geoff Mendal
77c5de0d68 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:16:49 +00:00
Geoff Mendal
fabfcfd97e Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:16:37 +00:00
Geoff Mendal
1781b7ed13 am 5a2b966a: (-s ours) am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '5a2b966ac490e59d0285934ac652dbaa02764f6b':
  Import translations. DO NOT MERGE
2015-02-12 23:12:18 +00:00
Geoff Mendal
10600e982d am cd15d997: (-s ours) am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'cd15d99721b514d6b104302217805ded5e194e43':
  Import translations. DO NOT MERGE
2015-02-12 23:12:13 +00:00
Geoff Mendal
8a8d800fba am 682cec12: (-s ours) am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '682cec120ee73d8e831e4d04c478712dc408cf02':
  Import translations. DO NOT MERGE
2015-02-12 23:12:09 +00:00
Geoff Mendal
fcbf8705e3 am 8a18ac3d: (-s ours) am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '8a18ac3d858262b93ba7270e99e25c261892bc80':
  Import translations. DO NOT MERGE
2015-02-12 23:12:05 +00:00
Geoff Mendal
2343e69a8e am f23a517a: (-s ours) am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'f23a517add2ad6c587bcfa691a1ac048818a39de':
  Import translations. DO NOT MERGE
2015-02-12 23:12:00 +00:00
Geoff Mendal
e2d143a1cc am df45d644: (-s ours) am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'df45d644b6fd4dda8d2e2b650ce262a2c5b3fe79':
  Import translations. DO NOT MERGE
2015-02-12 23:11:56 +00:00
Geoff Mendal
7a647ab30f am a01f5457: (-s ours) am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'a01f5457bc819fcb48ba1bae1849f54138510ea7':
  Import translations. DO NOT MERGE
2015-02-12 23:11:52 +00:00
John Spurlock
1be4b702f5 am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '7e7c91ec95eca5e1089ede9953f27d8c3d3b8bea':
  NoMan: Initialize filter value reported to listeners.
2015-02-12 23:11:36 +00:00
Todd Volkert
fddd7ead7c Merge "Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."" 2015-02-12 23:11:15 +00:00
Todd Volkert
455e0ea8f2 Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."
This reverts commit d23391eafe9f46ff01d5dc936126a4d6ae1c53d3.

Change-Id: Id7211a0fd08b9bc8ad092501de3c3efa57bf8264
2015-02-12 23:09:19 +00:00
Geoff Mendal
028e986c4c am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge: 14720e7  -s ours

* commit '14720e7a38e8eccf289de6a6da7ea42c41d87a04':
  Import translations. DO NOT MERGE
2015-02-12 23:09:01 +00:00
Geoff Mendal
16070689f0 Import translations. DO NOT MERGE
Change-Id: I536dd9e059bc42c5c399539e62d8aed02c9e446a
Auto-generated-cl: translation import
2015-02-12 15:06:15 -08:00
Geoff Mendal
5a2b966ac4 am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'e22cd0f9e6da18fe6827a481774e2998efbb5f46':
  Import translations. DO NOT MERGE
2015-02-12 23:05:28 +00:00
John Spurlock
7e7c91ec95 am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit 'e4049b6d36ded6ec808be5f884248772a4059a72':
  NoMan: Initialize filter value reported to listeners.
2015-02-12 23:05:25 +00:00
Geoff Mendal
cd15d99721 am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'dfe8fe3fcf551386d6107b67bc348d88207979c3':
  Import translations. DO NOT MERGE
2015-02-12 23:05:23 +00:00
Geoff Mendal
682cec120e am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '39b03e76365d1da92de51da3bd9f7677c7b16af8':
  Import translations. DO NOT MERGE
2015-02-12 23:05:18 +00:00
Geoff Mendal
8a18ac3d85 am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '7c958e2df0375761a1851cd02ca3aac3ee95f1c5':
  Import translations. DO NOT MERGE
2015-02-12 23:05:13 +00:00
Geoff Mendal
f23a517add am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'dc43cc88f02bde0917525e9fe274453bc000eb0a':
  Import translations. DO NOT MERGE
2015-02-12 23:05:08 +00:00
Geoff Mendal
df45d644b6 am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '5c7e4d99402bf0440ebd6713b6680f8abea175a3':
  Import translations. DO NOT MERGE
2015-02-12 23:05:04 +00:00
Geoff Mendal
a01f5457bc am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'be5aa9dda325a29c3f34cb9a97958c63f120f15e':
  Import translations. DO NOT MERGE
2015-02-12 23:04:59 +00:00
Geoff Mendal
14720e7a38 am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '6113edf578bba44de85698624026b4f48652fef9':
  Import translations. DO NOT MERGE
2015-02-12 23:04:54 +00:00
Geoff Mendal
5e5c39abdb Import translations. DO NOT MERGE
Change-Id: I57a4ac857f18a1e365e79198ac5de60748847add
Auto-generated-cl: translation import
2015-02-12 15:04:27 -08:00
Geoff Mendal
e22cd0f9e6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:29 +00:00
Geoff Mendal
dfe8fe3fcf Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:18 +00:00
Geoff Mendal
39b03e7636 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:58 +00:00
Geoff Mendal
7c958e2df0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:46 +00:00
Geoff Mendal
dc43cc88f0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:17 +00:00
Geoff Mendal
5c7e4d9940 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:58 +00:00
Geoff Mendal
be5aa9dda3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:25 +00:00
Geoff Mendal
6113edf578 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:58:47 +00:00
John Spurlock
e4049b6d36 am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit 'f45e5dbf599a0043d7f6576f20eafb2c1c157204':
  NoMan: Initialize filter value reported to listeners.
2015-02-12 22:58:44 +00:00
Geoff Mendal
dd1048e10a Import translations. DO NOT MERGE
Change-Id: I592c996ee5bd1d20bcd4ea595b3e6cbba08a4d0c
Auto-generated-cl: translation import
2015-02-12 14:55:57 -08:00
Geoff Mendal
0804199a6e Import translations. DO NOT MERGE
Change-Id: Ia9e245c983da6b04f3098269e611d1e193899be8
Auto-generated-cl: translation import
2015-02-12 14:53:58 -08:00
Todd Volkert
09247179cb Merge "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it." 2015-02-12 22:52:21 +00:00
John Spurlock
f45e5dbf59 Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 2015-02-12 22:52:13 +00:00
Geoff Mendal
b008c8f73a Import translations. DO NOT MERGE
Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1
Auto-generated-cl: translation import
2015-02-12 14:51:47 -08:00
Todd Volkert
d23391eafe Increase visibility of Transition.areValuesChanged() to protected to allow
subclasses outside the android.transition package to override it.

Change-Id: Ife5de79b339b6d7598411ad851858f4c52a89f5c
2015-02-12 14:47:20 -08:00
Geoff Mendal
899b20e374 Import translations. DO NOT MERGE
Change-Id: Ic17d83f48e83832042cd417f1196e6f108ad1724
Auto-generated-cl: translation import
2015-02-12 14:46:15 -08:00