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

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

Alan Viverette [Thu, 14 Jan 2016 21:44:31 +0000 (21:44 +0000)]

Don\'t verify the scrollbar drawable
am: a53c3b2197

* commit 'a53c3b2197b73d5b6a697ae2077e04065df84d9e':
Don't verify the scrollbar drawable

commit | commitdiff | tree

Alan Viverette [Thu, 14 Jan 2016 21:06:36 +0000 (16:06 -0500)]

Don't verify the scrollbar drawable

Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().

Bug: 26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9

commit | commitdiff | tree

Justin Harrison [Thu, 14 Jan 2016 06:44:21 +0000 (06:44 +0000)]

Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
am: e41a6c8b19

* commit 'e41a6c8b19482a05a98e77d13281f7f14056f119':
Fix race condition when setting default ringtones

commit | commitdiff | tree

Justin Harrison [Thu, 14 Jan 2016 06:42:20 +0000 (06:42 +0000)]

Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev

commit | commitdiff | tree

Amit Mahajan [Thu, 14 Jan 2016 06:33:00 +0000 (06:33 +0000)]

Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
am: c6c9b2aa66

* commit 'c6c9b2aa66635761b5cebc2faf9e06631c36eab5':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]

commit | commitdiff | tree

Amit Mahajan [Thu, 14 Jan 2016 06:30:15 +0000 (06:30 +0000)]

Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
am: 658fdf8426

* commit '658fdf8426e5c0fb68b7c04af651eae93a32b4b4':
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE

commit | commitdiff | tree

Amit Mahajan [Thu, 14 Jan 2016 06:28:47 +0000 (06:28 +0000)]

Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev

commit | commitdiff | tree

Amit Mahajan [Thu, 14 Jan 2016 06:26:26 +0000 (06:26 +0000)]

Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev

commit | commitdiff | tree

Chenjie Luo [Thu, 14 Jan 2016 02:29:13 +0000 (02:29 +0000)]

Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys

commit | commitdiff | tree

Vinit Deshpande [Thu, 14 Jan 2016 00:58:30 +0000 (16:58 -0800)]

Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]

Bug: 24147407

Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc

commit | commitdiff | tree

Chenjie Luo [Thu, 14 Jan 2016 02:24:48 +0000 (02:24 +0000)]

Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys

commit | commitdiff | tree

Chenjie Luo [Thu, 14 Jan 2016 02:22:15 +0000 (02:22 +0000)]

Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev

commit | commitdiff | tree

Amit Mahajan [Wed, 13 Jan 2016 02:25:33 +0000 (18:25 -0800)]

DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE

Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5

commit | commitdiff | tree

Chenjie Luo [Wed, 13 Jan 2016 19:01:59 +0000 (11:01 -0800)]

Add STEM_1, STEM_2 and STEM_3 key as wakeup keys

Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5

commit | commitdiff | tree

Adam Lesinski [Thu, 14 Jan 2016 00:54:10 +0000 (00:54 +0000)]

Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
UsageStats: Use new settings key idle_duration2 for app idle

commit | commitdiff | tree

Adam Lesinski [Thu, 14 Jan 2016 00:45:31 +0000 (00:45 +0000)]

Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev

commit | commitdiff | tree

Nancy Zheng [Thu, 14 Jan 2016 00:12:14 +0000 (00:12 +0000)]

Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1
am: f474056e99

* commit 'f474056e99de892b731155989ee0d9dae1d3eea7':
Pulling in https://android-review.googlesource.com/#/c/186482/1

commit | commitdiff | tree

Nancy Zheng [Wed, 13 Jan 2016 23:59:42 +0000 (23:59 +0000)]

Pulling in https://android-review.googlesource.com/#/c/186482/1
am: 74dfcf90f1

* commit '74dfcf90f18d8d0e1128707a5986c4fa94d70350':
Pulling in https://android-review.googlesource.com/#/c/186482/1

commit | commitdiff | tree

Nancy Zheng [Wed, 13 Jan 2016 23:23:56 +0000 (15:23 -0800)]

Pulling in https://android-review.googlesource.com/#/c/186482/1

Fix memory leak in HWUI

std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.

Bug: 26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3

commit | commitdiff | tree

Selim Cinek [Wed, 13 Jan 2016 23:10:20 +0000 (23:10 +0000)]

Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev
am: d23f1eb0cd

* commit 'd23f1eb0cd9893395573a4059be195e8fdb1007a':
Fixed a crash with the heads up manager

commit | commitdiff | tree

Ian Pedowitz [Wed, 13 Jan 2016 23:01:29 +0000 (23:01 +0000)]

Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
Revert "Avoid drawable invalidation during draw()"

commit | commitdiff | tree

Selim Cinek [Wed, 13 Jan 2016 23:01:13 +0000 (23:01 +0000)]

Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev

commit | commitdiff | tree

Ian Pedowitz [Wed, 13 Jan 2016 22:47:45 +0000 (22:47 +0000)]

Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev

commit | commitdiff | tree

Alan Viverette [Wed, 13 Jan 2016 21:49:10 +0000 (21:49 +0000)]

Revert "Avoid drawable invalidation during draw()"

This reverts commit e5e59c6da424096da8f57137cdc57d8bd410b079.

Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.

Bug: 26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47

commit | commitdiff | tree

Selim Cinek [Fri, 6 Nov 2015 19:33:20 +0000 (11:33 -0800)]

Fixed a crash with the heads up manager

Bug: 25693389
Change-Id: Id852e342000bff6de0ce19f442eb53b21e935b7b

commit | commitdiff | tree

Adam Lesinski [Wed, 13 Jan 2016 20:26:07 +0000 (12:26 -0800)]

UsageStats: Use new settings key idle_duration2 for app idle

Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386

Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090

commit | commitdiff | tree

Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:35:46 +0000 (20:35 +0000)]

Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev
am: 9ae30e69ad

* commit '9ae30e69ada03ebf3408ed1d2f24a5a67ea33b68':
Add WiFi Calling overlays for T-Mobile's MCCMNCs

commit | commitdiff | tree

Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:30:46 +0000 (20:30 +0000)]

Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev

commit | commitdiff | tree

Pavel Zhamaitsiak [Wed, 13 Jan 2016 19:19:05 +0000 (11:19 -0800)]

Add WiFi Calling overlays for T-Mobile's MCCMNCs

Bug: 26024279
Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000

commit | commitdiff | tree

Keisuke Kuroyanagi [Wed, 13 Jan 2016 18:57:42 +0000 (18:57 +0000)]

Tests for getPrimaryHorizontal with grapheme boundaries
am: a5c53291a8

* commit 'a5c53291a8123fa0296c849fe153a7dcf79b4dda':
Tests for getPrimaryHorizontal with grapheme boundaries

commit | commitdiff | tree

Keisuke Kuroyanagi [Wed, 13 Jan 2016 06:47:34 +0000 (15:47 +0900)]

Tests for getPrimaryHorizontal with grapheme boundaries

Bug: 25375561
Change-Id: I022473627499d7f18105e3a300754fae5be7da8e

commit | commitdiff | tree

Adam Lesinski [Wed, 13 Jan 2016 02:04:17 +0000 (02:04 +0000)]

Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev
am: f2cc98bc96

* commit 'f2cc98bc967c1b14d779198046137bf13aeb219c':
UsageStats: Fix issue where initializing data for first time would cause crash

commit | commitdiff | tree

Adam Lesinski [Wed, 13 Jan 2016 01:48:45 +0000 (01:48 +0000)]

Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev

commit | commitdiff | tree

Adam Lesinski [Tue, 12 Jan 2016 18:36:09 +0000 (10:36 -0800)]

UsageStats: Fix issue where initializing data for first time would cause crash

With the updated rolling window of stats for app idleness, we need to make sure
it is populated before we initialize some defaults.

Now that we look at older entries to figure out idleness, if those
entries are in the future (due to time change), set them to the current
screen on time.
Bug:26504153

Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69

commit | commitdiff | tree

Matthew Bouyack [Tue, 12 Jan 2016 22:40:13 +0000 (22:40 +0000)]

Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am: eebf168e43
am: e0845e8629

* commit 'e0845e86299a35f84ad63177047745de5a6020e9':
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.

commit | commitdiff | tree

Matthew Bouyack [Tue, 12 Jan 2016 22:33:09 +0000 (22:33 +0000)]

Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev
am: eebf168e43

* commit 'eebf168e43e4a455a74e949cc0d7e156b231a697':
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.

commit | commitdiff | tree

Matthew Bouyack [Tue, 12 Jan 2016 22:28:21 +0000 (22:28 +0000)]

Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev

commit | commitdiff | tree

Matthew Bouyack [Tue, 12 Jan 2016 20:01:48 +0000 (12:01 -0800)]

In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos
and save the result. Then pass that value to
UiFrameInfoBuilder::setVsync as both arguments.

The order of function argument evaluation is undefined in C++. Because
the value returned from TimeLord::latestVsync may be changed by
the preceding call to TimeLord::computeFrameTimeNanos the values of the
arguments passed to UiFrameInfoBuilder::setVsync is also undefined. This
change removes any ambiguity.

Change-Id: Ie71ee453f9ccc725edfe5f7cc9b277f2a809dfdc

commit | commitdiff | tree

Alan Viverette [Tue, 12 Jan 2016 19:22:16 +0000 (19:22 +0000)]

Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev
am: cf6885b7b7

* commit 'cf6885b7b7665b5589c0640e1cf4b98780f3aeec':
Avoid drawable invalidation during draw()

commit | commitdiff | tree

Alan Viverette [Tue, 12 Jan 2016 19:18:28 +0000 (19:18 +0000)]

Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev

commit | commitdiff | tree

Alan Viverette [Tue, 12 Jan 2016 18:53:45 +0000 (18:53 +0000)]

Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev
am: d9434699e4

* commit 'd9434699e4ef8c528ce01223ee9ef200bfd693e4':
Handle null result from getVirtualChildAt()

commit | commitdiff | tree

Jason Monk [Tue, 12 Jan 2016 18:51:32 +0000 (18:51 +0000)]

Get data type from service state as well
am: 67b2c16a9a

* commit '67b2c16a9a9060d37888bdab4dfadd384a76e9d7':
Get data type from service state as well

commit | commitdiff | tree

Alan Viverette [Tue, 12 Jan 2016 18:19:33 +0000 (18:19 +0000)]

Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev

commit | commitdiff | tree

Marco Nelissen [Fri, 6 Nov 2015 00:44:52 +0000 (16:44 -0800)]

Fix race condition when setting default ringtones

If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Bug: 25633323
Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158

commit | commitdiff | tree

Jason Monk [Tue, 12 Jan 2016 15:24:09 +0000 (10:24 -0500)]

Get data type from service state as well

Bug: 26276354
Bug: 26413831
Change-Id: Ic080300db7d5e5200caf611cc2ee1ef3af93736e

commit | commitdiff | tree

Alan Viverette [Mon, 4 Jan 2016 17:36:28 +0000 (12:36 -0500)]

Avoid drawable invalidation during draw()

Prevents infinite invalidation loop when reusing a drawable asset within
a single draw() call. Also reduces unnecessary extra invalidations due to
drawable setters (ex. setBounds()) being called during draw().

Bug: 26329675
Change-Id: I31b3c99e8efd4193415cc562a84c8939a2f56c2d
(cherry picked from commit 8cda8e915916b3166e4496589b802fd1ed553c77)

commit | commitdiff | tree

Alan Viverette [Thu, 17 Dec 2015 17:42:39 +0000 (12:42 -0500)]

Handle null result from getVirtualChildAt()

Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.

Bug: 25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
(cherry picked from commit ad52693cf3dfe3f5e84f5a22fe4c3787f2f2cbfb)

commit | commitdiff | tree

Doris Liu [Tue, 12 Jan 2016 01:39:05 +0000 (01:39 +0000)]

Merge "Get animation update timing for AVD" into mnc-dr1.5-dev
am: a73abeaf4b

* commit 'a73abeaf4b7b158664c34124d8df39ad843f7451':
Get animation update timing for AVD

commit | commitdiff | tree

Doris Liu [Tue, 12 Jan 2016 01:36:23 +0000 (01:36 +0000)]

Merge "Get animation update timing for AVD" into mnc-dr1.5-dev

commit | commitdiff | tree

Raph Levien [Tue, 12 Jan 2016 01:15:06 +0000 (01:15 +0000)]

Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev
am: 9f2c939730

* commit '9f2c939730730e76afc46e891b82499b499503e1':
Respect grapheme clusters in Layout#getOffsetForHorizontal.
Fix: Cursor can be at an invalid offset in EditText.

commit | commitdiff | tree

Raph Levien [Tue, 12 Jan 2016 01:13:37 +0000 (01:13 +0000)]

Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev
am: 36c5ab3542

* commit '36c5ab3542624f9634106390fa34482babe2d8d3':
Fix measurement to respect grapheme and span boundaries

commit | commitdiff | tree

Raph Levien [Tue, 12 Jan 2016 01:10:52 +0000 (01:10 +0000)]

Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev

* changes:
Respect grapheme clusters in Layout#getOffsetForHorizontal.
Fix: Cursor can be at an invalid offset in EditText.

commit | commitdiff | tree

Raph Levien [Tue, 12 Jan 2016 01:10:52 +0000 (01:10 +0000)]

Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev

commit | commitdiff | tree

Adam Lesinski [Tue, 12 Jan 2016 00:38:09 +0000 (00:38 +0000)]

Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev
am: 15df80f069

* commit '15df80f069c72989539df560c02f377ae9214ae2':
UsageStatsService: Fix app idle issue at rollover time

commit | commitdiff | tree

Adam Lesinski [Tue, 12 Jan 2016 00:28:28 +0000 (00:28 +0000)]

Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev

commit | commitdiff | tree

Doris Liu [Thu, 7 Jan 2016 22:24:57 +0000 (14:24 -0800)]

Get animation update timing for AVD

The goal for this change is to get the timing for animation update. Since
AnimatorSet does not support update listeners, we have to go with the a different
approach, which sets up a value animator that runs between the start and end of
the AnimatorSet. We can then get the animation update timing from the ValueAnimator.

Bug: 26329675
Change-Id: Ibe7fce81eb6da5e05c87a732c1d3bc904b4e5e6f
(cherry picked from commit I378a0964da8f7090f65f6b56275a302e30668835)

commit | commitdiff | tree

Keisuke Kuroyanagi [Fri, 8 Jan 2016 10:55:17 +0000 (19:55 +0900)]

Respect grapheme clusters in Layout#getOffsetForHorizontal.

TextUtils#getOffsetAfter was used for getting the next
offset in Layout#getOffsetForHorizontal. However, this
method doesn't treat grapheme clusters properly.
Changed to use TextLine#getOffsetToLeftRightOf instead of
TextUtils#getOffsetAfter.

Bug: 25375561
Change-Id: I96c9e6e5da65adfb5266446ecab852c52628dbb5

commit | commitdiff | tree

Keisuke Kuroyanagi [Thu, 27 Aug 2015 09:15:48 +0000 (18:15 +0900)]

Fix: Cursor can be at an invalid offset in EditText.

"getLineEnd(line) - 1" is used as the return value when the
"horiz" is beyond the line end for multiple line text.
In this case, the returned value can point an invalid
offset like the middle point of a surrogate pair.

Bug: 23069901
Change-Id: I1afef7205a15079a42bb0018df73f70fe9ada862
(cherry picked from commit 00ad16d1cd24b788262ab4f62935e720a392da6d)

commit | commitdiff | tree

Raph Levien [Tue, 1 Dec 2015 05:05:46 +0000 (21:05 -0800)]

Fix measurement to respect grapheme and span boundaries

When measuring in TextLine (important for cursor positioning), the
substring measured must neither be too short (it can't just be the
substring up to the measure limit, but must include additional
characters if they form a ligature) nor too long (it can't extend
beyond the end of the CharacterStyle span, otherwise the measurement
fails to account for the fact that the CharacterStyle span boundary
breaks the ligature). This patch gets it just right.

Bug: 25375561
Change-Id: I36e1c4bdc66424d3b611cf54031756cf54cf3fec

commit | commitdiff | tree

Sungmin Choi [Mon, 11 Jan 2016 20:31:57 +0000 (20:31 +0000)]

Add carrier config variable to support editable wfc mode
am: d3b2826a1a

* commit 'd3b2826a1a3ff128db1e89a081124192ac70c509':
Add carrier config variable to support editable wfc mode

commit | commitdiff | tree

Sungmin Choi [Wed, 23 Dec 2015 05:10:41 +0000 (14:10 +0900)]

Add carrier config variable to support editable wfc mode

Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.

Bug: 26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 16:01:55 +0000 (16:01 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1  -s ours am: 73992aee94  -s ours am: 0663959eb7  -s ours am: 8635657b17  -s ours
am: 4c042b096e  -s ours

* commit '4c042b096e3b25f7292d13b4c44d79cb79ebeb36':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:51:36 +0000 (15:51 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1  -s ours am: 73992aee94  -s ours am: 0663959eb7  -s ours
am: 8635657b17  -s ours

* commit '8635657b176ee9f80e8f57a7d1da9278722ff8a0':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:46:49 +0000 (15:46 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1  -s ours am: 73992aee94  -s ours
am: 0663959eb7  -s ours

* commit '0663959eb73127a49d0a72a70000f3b092adc3e6':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:42:10 +0000 (15:42 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1  -s ours
am: 73992aee94  -s ours

* commit '73992aee94ce78b8827fe05bb5537068a96c835d':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:37:27 +0000 (15:37 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am: 66841a62f1 -s ours

* commit '66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:33:48 +0000 (15:33 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:33:28 +0000 (15:33 +0000)]

Revert "Import translations. DO NOT MERGE"

This reverts commit a4505e926410cbf20dcd301f35f3496628cad9de.

Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:02:10 +0000 (15:02 +0000)]

Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev
am: ddee7d949d

* commit 'ddee7d949dbd1fd5d18e11322532e78cd8330554':

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:00:49 +0000 (15:00 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours am: 009fb756ec  -s ours am: b409a99ccc  -s ours am: 14c37a57ea  -s ours am: 0b8de39728  -s ours am: 9f094ac04d  -s ours
am: 38aaa9981a  -s ours

* commit '38aaa9981a62b0978c65f86f22102383bb2d5f01':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:59:20 +0000 (14:59 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours am: 83bf32ebe5  -s ours am: 42692affe2  -s ours am: 8ea585955c  -s ours am: 4ae777097e  -s ours am: 23c92d99cf  -s ours
am: 67ba224dbf  -s ours

* commit '67ba224dbf81e6c1a63bc11a1b02edd45c5c1d4a':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:57:38 +0000 (14:57 +0000)]

Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:57:07 +0000 (14:57 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours am: 009fb756ec  -s ours am: b409a99ccc  -s ours am: 14c37a57ea  -s ours am: 0b8de39728  -s ours
am: 9f094ac04d  -s ours

* commit '9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:56:01 +0000 (14:56 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours am: 009fb756ec  -s ours am: b409a99ccc  -s ours am: 14c37a57ea  -s ours am: 0b8de39728  -s ours
am: 9f094ac04d  -s ours

* commit '9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:54:39 +0000 (14:54 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours am: 83bf32ebe5  -s ours am: 42692affe2  -s ours am: 8ea585955c  -s ours am: 4ae777097e  -s ours
am: 23c92d99cf  -s ours

* commit '23c92d99cf4f613f212710e73bb46c9c5895918f':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:52:22 +0000 (14:52 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours am: 009fb756ec  -s ours am: b409a99ccc  -s ours am: 14c37a57ea  -s ours
am: 0b8de39728  -s ours

* commit '0b8de39728014ad51ff6784a3850a3d752f715e3':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:50:39 +0000 (14:50 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours am: 83bf32ebe5  -s ours am: 42692affe2  -s ours am: 8ea585955c  -s ours
am: 4ae777097e  -s ours

* commit '4ae777097e4242e546c0b7e477cbd0829689dff5':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:45:46 +0000 (14:45 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours am: 009fb756ec  -s ours am: b409a99ccc  -s ours
am: 14c37a57ea  -s ours

* commit '14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:41:17 +0000 (14:41 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours am: 009fb756ec  -s ours
am: b409a99ccc  -s ours

* commit 'b409a99ccc0a42814f3918c689d06526c09f726b':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:36:52 +0000 (14:36 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours
am: 009fb756ec  -s ours

* commit '009fb756ecabd78e5300c619c267f2e55cfd0922':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:32:36 +0000 (14:32 +0000)]

Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da  -s ours am: 1c51eb41ee  -s ours am: eab7785333  -s ours am: 2ed7b6d82a  -s ours
am: d344dc256b  -s ours

* commit 'd344dc256bf0a2b786e1a1f1e99acf3f83b97e75':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:32:35 +0000 (14:32 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours
am: 4df8f4abe0  -s ours

* commit '4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:28:57 +0000 (14:28 +0000)]

Revert "Import translations. DO NOT MERGE"
am: 8874f9754f -s ours

* commit '8874f9754f909dafcc2c5c23109e35297263f469':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:28:55 +0000 (14:28 +0000)]

Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da  -s ours am: 1c51eb41ee  -s ours am: eab7785333  -s ours
am: 2ed7b6d82a  -s ours

* commit '2ed7b6d82a921f085ee22914ecb0a09456ac44ed':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:24:19 +0000 (14:24 +0000)]

Revert "Import translations. DO NOT MERGE"

This reverts commit 9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.

Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:22:02 +0000 (14:22 +0000)]

Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da  -s ours am: 1c51eb41ee  -s ours
am: eab7785333  -s ours

* commit 'eab778533331bc25b3b201ebb9519a016a451ae4':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:16:41 +0000 (14:16 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours am: 83bf32ebe5  -s ours am: 42692affe2  -s ours
am: 8ea585955c  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:16:40 +0000 (14:16 +0000)]

Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da  -s ours
am: 1c51eb41ee  -s ours

* commit '1c51eb41ee57bb2aeff62dd23576c6565a86de17':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours am: 83bf32ebe5  -s ours
am: 42692affe2  -s ours

* commit '42692affe23352b7e0bbcc9ef4d6f5fb661cc943':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]

Revert "Import translations. DO NOT MERGE"
am: 9e5fe1a7da -s ours

* commit '9e5fe1a7da02055c03b434db04f0927ba174f3f9':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:07:45 +0000 (14:07 +0000)]

Import translations. DO NOT MERGE am: a4505e9264  -s ours am: bc3b9e2a83  -s ours am: a6a761d9fd  -s ours am: a8ae80950e  -s ours
am: 82666a9f2a  -s ours

* commit '82666a9f2a1cee49a23291602128b257abf9a64f':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:05:05 +0000 (14:05 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours
am: 83bf32ebe5  -s ours

* commit '83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:04:51 +0000 (14:04 +0000)]

Revert "Import translations. DO NOT MERGE"

This reverts commit f7e5202668cd2b0dc26a65e46b68a4267567bce0.

Change-Id: Ia54e4b766ea2a9f9815baef29df546605d1c3672

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:02:31 +0000 (14:02 +0000)]

Import translations. DO NOT MERGE am: f7e5202668  -s ours am: 0b1a880876  -s ours am: f272b0a87e  -s ours am: 0c6bf20b04  -s ours
am: 62e77bd206  -s ours

* commit '62e77bd206c2c3dd69ca62b5f02d5550559012d3':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:59:58 +0000 (13:59 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours
am: b441c6926b  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:59:57 +0000 (13:59 +0000)]

Import translations. DO NOT MERGE am: a4505e9264  -s ours am: bc3b9e2a83  -s ours am: a6a761d9fd  -s ours
am: a8ae80950e  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:57:31 +0000 (13:57 +0000)]

Import translations. DO NOT MERGE am: f7e5202668  -s ours am: 0b1a880876  -s ours am: f272b0a87e  -s ours
am: 0c6bf20b04  -s ours

* commit '0c6bf20b04b8eb3c3b66d563ed497491ddb511c5':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:54:49 +0000 (13:54 +0000)]

Import translations. DO NOT MERGE
am: 9f9e736e0d -s ours

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

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:54:46 +0000 (13:54 +0000)]

Import translations. DO NOT MERGE am: a4505e9264  -s ours am: bc3b9e2a83  -s ours
am: a6a761d9fd  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:52:00 +0000 (13:52 +0000)]

Import translations. DO NOT MERGE am: f7e5202668  -s ours am: 0b1a880876  -s ours
am: f272b0a87e  -s ours

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

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help