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

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

Alex Klyubin [Fri, 5 Feb 2016 22:33:09 +0000 (22:33 +0000)]

Merge "Fix typo in KeyInfo Javadoc."
am: e8fbc20e12

* commit 'e8fbc20e12da685acddffc01c41ccf134f051ce9':
Fix typo in KeyInfo Javadoc.

commit | commitdiff | tree

Alex Klyubin [Fri, 5 Feb 2016 22:26:56 +0000 (22:26 +0000)]

Merge "Fix typo in KeyInfo Javadoc."

commit | commitdiff | tree

Alex Klyubin [Fri, 5 Feb 2016 22:18:19 +0000 (14:18 -0800)]

Fix typo in KeyInfo Javadoc.

Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203

commit | commitdiff | tree

Igor Murashkin [Fri, 5 Feb 2016 18:02:05 +0000 (18:02 +0000)]

Merge "api: Un-hide new reflection 1.8 APIs"
am: 700ed048f9

* commit '700ed048f9c860fb18439ef79a8b7b107e7fe054':
api: Un-hide new reflection 1.8 APIs

commit | commitdiff | tree

Igor Murashkin [Fri, 5 Feb 2016 17:53:04 +0000 (17:53 +0000)]

Merge "api: Un-hide new reflection 1.8 APIs"

commit | commitdiff | tree

Igor Murashkin [Fri, 5 Feb 2016 05:04:29 +0000 (21:04 -0800)]

api: Un-hide new reflection 1.8 APIs

(cherry-picked from commit 2b11b688b841a00afe5eda8bda02409172751318)
Change-Id: Ica3dba651f4a9239c39c4c90fb8478a5f6ff8b71

commit | commitdiff | tree

Martijn Coenen [Fri, 5 Feb 2016 09:44:28 +0000 (09:44 +0000)]

Merge "Improve NFC-F transceive() docs."
am: 1f4f7190a8

* commit '1f4f7190a8fe6bd87fd9dd198cb711cb1a540354':
Improve NFC-F transceive() docs.

commit | commitdiff | tree

Martijn Coenen [Fri, 5 Feb 2016 09:38:16 +0000 (09:38 +0000)]

Merge "Improve NFC-F transceive() docs."

commit | commitdiff | tree

Martijn Coenen [Fri, 5 Feb 2016 09:24:49 +0000 (10:24 +0100)]

Improve NFC-F transceive() docs.

It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.

Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc

commit | commitdiff | tree

Amith Yamasani [Thu, 4 Feb 2016 22:00:38 +0000 (22:00 +0000)]

Merge "Transit to correct state after alarm is fired"
am: f3c432059c

* commit 'f3c432059c44e8e74b0385adde5f619e4d8eba0d':
Transit to correct state after alarm is fired

commit | commitdiff | tree

Amith Yamasani [Thu, 4 Feb 2016 21:52:54 +0000 (21:52 +0000)]

Merge "Transit to correct state after alarm is fired"

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:41:11 +0000 (18:41 +0000)]

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev am: e2c27eede5  -s ours am: 44b73f54fb  -s ours
am: 3db7909c7a  -s ours

* commit '3db7909c7a2b827a9c887ae8a00360cb75001c8b':
  DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:35:22 +0000 (18:35 +0000)]

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev am: e2c27eede5  -s ours
am: 44b73f54fb  -s ours

* commit '44b73f54fb223538eb05fe7b86ff0f47c117be7e':
  DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:28:10 +0000 (18:28 +0000)]

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev
am: e2c27eede5 -s ours

* commit 'e2c27eede562241423c02d086703b12d4b3dddd3':
DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:23:59 +0000 (18:23 +0000)]

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:15:26 +0000 (18:15 +0000)]

Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev am: fbd88d132e  -s ours am: 4577aac551  -s ours
am: 1886efacfc  -s ours

* commit '1886efacfc22aff9e191cd57820c2d151bac66e3':
  DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:10:16 +0000 (18:10 +0000)]

Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev am: fbd88d132e  -s ours
am: 4577aac551  -s ours

* commit '4577aac5510db6c3255a5e09a573c52bbfa8b609':
  DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:05:34 +0000 (18:05 +0000)]

Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev
am: fbd88d132e -s ours

* commit 'fbd88d132e3d75c9f1af607fc1ba00a6596d7406':
DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:01:45 +0000 (18:01 +0000)]

Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev

commit | commitdiff | tree

Koji Fukui [Wed, 16 Dec 2015 10:43:01 +0000 (19:43 +0900)]

Transit to correct state after alarm is fired

Symptom:
When AlarmClock fires in IDLE, state is changed to ACTIVE.
But the ACTIVE state continues under some conditions.

Root cause:
Transition from IDLE state to ACTIVE state when AlarmClock fires
1. Send ACTION_STEP_IDLE_STATE intent
2. Calles onReceive() in BroadcastReceiver
3. Calles stepIdleStateLocked()
4. Calles becomeActiveLocked()　

Check point (1) to change from ACTIVE state to INACTIVE
(Display On -> Off)
1. onDisplayChanged()
2. updateDisplayLocked()
3. becomeInactiveIfAppropriateLocked()

Check point (2) to change from ACTIVE state to INACTIVE
(charging -> not charging)
1. ACTION_BATTERY_CHANGED
2. updateChargingLocked()
3. becomeInactiveIfAppropriateLocked()

There are only two check points to change from ACTIVE to INACTIVE.
If state transition, from IDLE to ACTIVE,
happened by AlarmClock when display is off and not charging,
ACTIVE state will be kept and never changes to INACTIVE state.

Change-Id: I93398366307f529b9c0074ac58b19ad6e4695790

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 00:57:31 +0000 (16:57 -0800)]

DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.

We can set config.disable_rtt in the init script to disable the
RttService.

b/26877020

Change-Id: Ifb7fedc4764329dc09cae41f06bf6d5fc7426e5f

commit | commitdiff | tree

Wei Liu [Wed, 3 Feb 2016 22:31:37 +0000 (14:31 -0800)]

DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.

b/26877020

Change-Id: Idfef31edb7e67ae60c1b2205df326ed1c5657618

commit | commitdiff | tree

Andre Eisenbach [Thu, 4 Feb 2016 00:35:32 +0000 (00:35 +0000)]

Merge "Implementation of BluetoothDevice.createBondOutOfBand"
am: 026a58476b

* commit '026a58476ba219bcc08608c2e6156683c9158d5d':
Implementation of BluetoothDevice.createBondOutOfBand

commit | commitdiff | tree

Andre Eisenbach [Thu, 4 Feb 2016 00:25:34 +0000 (00:25 +0000)]

Merge "Implementation of BluetoothDevice.createBondOutOfBand"

commit | commitdiff | tree

Jakub Pawlowski [Tue, 29 Dec 2015 21:19:21 +0000 (13:19 -0800)]

Implementation of BluetoothDevice.createBondOutOfBand

This patch implements out of band pairing that uses optional data.
Currently, it works only for LE transport, using Temporary Key value.
In the future fields might be added to OOBData to support other options for
optional data.

Change-Id: I0811182efb72ac5f80521ed4876b32603cb628c1

commit | commitdiff | tree

Eric Laurent [Wed, 3 Feb 2016 18:02:20 +0000 (18:02 +0000)]

Merge "Bluetooth: Restrict gain for Absolute volume case"
am: 81e7a58754

* commit '81e7a5875465f9b2b7ed785d4f138b11f386c5c1':
Bluetooth: Restrict gain for Absolute volume case

commit | commitdiff | tree

Eric Laurent [Wed, 3 Feb 2016 17:30:39 +0000 (17:30 +0000)]

Merge "Bluetooth: Restrict gain for Absolute volume case"

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 16:40:38 +0000 (16:40 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 8152fbd7e9 -s ours

* commit '8152fbd7e999fe57f85944a12b281be47fec0a79':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 15:54:07 +0000 (15:54 +0000)]

Import translations. DO NOT MERGE am: a3144a52c6  -s ours
am: 1a0c0953a0  -s ours

* commit '1a0c0953a0ffebe876e9abcf63d2c3e8e2d12a6f':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 15:44:40 +0000 (15:44 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 15:42:52 +0000 (10:42 -0500)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 15:24:32 +0000 (15:24 +0000)]

Import translations. DO NOT MERGE
am: a3144a52c6 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 14:57:33 +0000 (09:57 -0500)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:45:43 +0000 (11:45 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: d3f6510b6f -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:37:19 +0000 (11:37 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 7c5cf65b83 -s ours

* commit '7c5cf65b83b84c236c0e156c100c2af3b9300c08':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:28:31 +0000 (11:28 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: e8f321c778 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:17:26 +0000 (11:17 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 091a828fb5 -s ours

* commit '091a828fb5220d367124bd72a3e2c020e8200feb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:13:58 +0000 (11:13 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: f47a2c9fb9 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:09:58 +0000 (11:09 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 762829795f -s ours

* commit '762829795f52c701f244550ec142fbd35a631a28':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:05:42 +0000 (11:05 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: fd92981842 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:02:40 +0000 (11:02 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 45267b2f06 -s ours

* commit '45267b2f068fda88741ec5f9d949b6b19d232ed3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 11:00:03 +0000 (11:00 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 38f33925f8 -s ours

* commit '38f33925f87a0d705e4b0f3c2959978368a9c0b6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:56:37 +0000 (10:56 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: e6faf1a713 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:54:05 +0000 (10:54 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: fba9bae4d1 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:49:28 +0000 (10:49 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 6779c7d415 -s ours

* commit '6779c7d41583a01ca304543979d3d5a90af5cc57':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:46:00 +0000 (10:46 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93  -s ours
am: 768b07ca66  -s ours

* commit '768b07ca66e9a0780e17d3d8542b601e2ffc2771':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:43:24 +0000 (10:43 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours
am: b1be124b15  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:40:41 +0000 (10:40 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours
am: a0159dfc08  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:38:09 +0000 (10:38 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5  -s ours
am: a85507482f  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:37:05 +0000 (10:37 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c  -s ours
am: 4d79bcf457  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:36:01 +0000 (10:36 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3  -s ours
am: aa7e0396c9  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:35:02 +0000 (10:35 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a  -s ours
am: 0291cf7113  -s ours

* commit '0291cf7113023c58a02110e8a4f7e191d37510ca':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:33:55 +0000 (10:33 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8  -s ours
am: 008f7facbe  -s ours

* commit '008f7facbed95e67cf45ff81013b83e7f44c54aa':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:32:50 +0000 (10:32 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb  -s ours
am: abaebda3ff  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:31:45 +0000 (10:31 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353  -s ours
am: 6dfc27dac9  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:30:38 +0000 (10:30 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93  -s ours
am: 79d8d1a13f  -s ours

* commit '79d8d1a13f719edb5238972ab6123643cf911146':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 10:29:24 +0000 (10:29 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d  -s ours
am: c2ca962f06  -s ours

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:39:57 +0000 (00:39 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:38:12 +0000 (06:08 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:13:12 +0000 (00:13 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:11:42 +0000 (05:41 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:10:01 +0000 (00:10 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:09:39 +0000 (00:09 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:06:59 +0000 (05:36 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Feb 2016 00:01:35 +0000 (05:31 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:52:53 +0000 (23:52 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:49:05 +0000 (05:19 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:46:39 +0000 (23:46 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:46:19 +0000 (23:46 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:46:03 +0000 (23:46 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:45:28 +0000 (23:45 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:45:09 +0000 (23:45 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:44:52 +0000 (23:44 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:44:33 +0000 (23:44 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:44:15 +0000 (05:14 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:39:18 +0000 (05:09 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:34:29 +0000 (05:04 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:29:17 +0000 (04:59 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:24:24 +0000 (04:54 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:19:17 +0000 (04:49 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 23:14:14 +0000 (04:44 +0530)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:48:24 +0000 (21:48 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: c0297abd93 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:46:54 +0000 (21:46 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 4a27667bf5 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:45:55 +0000 (21:45 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 091513d6e8 -s ours

* commit '091513d6e84a1a28f1de1174532e42784d3ce584':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:44:53 +0000 (21:44 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 1974686db5 -s ours

* commit '1974686db5089e9b899f3700fb66a4269758d082':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:40:54 +0000 (21:40 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:40:04 +0000 (21:40 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 063357312c -s ours

* commit '063357312c77681ca7093f4416ed12ff0ae04c83':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:40:03 +0000 (13:40 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:38:02 +0000 (21:38 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 3122eedcd3 -s ours

* commit '3122eedcd3f2e378a96d9486d6418449414059ac':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:36:04 +0000 (21:36 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: b697973e2a -s ours

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:34:39 +0000 (21:34 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 21e0a012d8 -s ours

* commit '21e0a012d811af456bbeb9289012676dac11a49e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:33:44 +0000 (21:33 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 497300badb -s ours

* commit '497300badb86c3e253d1ef25b3e290b9bf5c355e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:32:16 +0000 (21:32 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 9561ec3353 -s ours

* commit '9561ec3353753c9b79b03a910725b33d2628c7ab':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:30:50 +0000 (21:30 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 6f63adbe93 -s ours

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:29:47 +0000 (21:29 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 26b12b719d -s ours

* commit '26b12b719d317ae8d57f5b43bd9cd1e96b2cad5d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:28:40 +0000 (21:28 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:28:20 +0000 (21:28 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:28:02 +0000 (21:28 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 2 Feb 2016 21:27:36 +0000 (21:27 +0000)]

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