OSDN Git Service
Baligh Uddin [Thu, 5 Nov 2015 19:49:17 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:41:33 +0000 (19:41 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:40:59 +0000 (19:40 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
am:
22b7e496c2
* commit '
22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
Use std::unique_ptr instead of UniquePtr.
Baligh Uddin [Thu, 5 Nov 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:25 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:15 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:20 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:16 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:12 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:32:43 +0000 (19:32 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
Baligh Uddin [Thu, 5 Nov 2015 19:32:07 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:32:05 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Chad Brubaker [Thu, 5 Nov 2015 18:52:46 +0000 (18:52 +0000)]
Merge "Add initial network security config implementation"
am:
8c35820720
* commit '
8c358207206c5e19541c65e3f9761d1adb54550b':
Add initial network security config implementation
Chad Brubaker [Thu, 5 Nov 2015 18:46:24 +0000 (18:46 +0000)]
Merge "Add initial network security config implementation"
Brian Carlstrom [Thu, 5 Nov 2015 18:42:53 +0000 (18:42 +0000)]
Merge "Fixes for sm and pm usage"
am:
ffb15da518
* commit '
ffb15da518e35727e218bfba48927902d4368e2f':
Fixes for sm and pm usage
Brian Carlstrom [Thu, 5 Nov 2015 18:38:56 +0000 (18:38 +0000)]
Merge "Fixes for sm and pm usage"
Brian Carlstrom [Thu, 5 Nov 2015 18:33:40 +0000 (10:33 -0800)]
Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"
Bug:
20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
Dan Albert [Thu, 5 Nov 2015 18:22:57 +0000 (18:22 +0000)]
Merge "Don\'t apply clang flag to gcc builds."
am:
d9a1b35df6
* commit '
d9a1b35df62eddc56f69281aea1534d187b63205':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:18:45 +0000 (18:18 +0000)]
Merge "Don't apply clang flag to gcc builds."
Dan Albert [Thu, 5 Nov 2015 08:59:09 +0000 (00:59 -0800)]
Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).
Bug: http://b/
22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
Dan Albert [Thu, 5 Nov 2015 08:57:12 +0000 (00:57 -0800)]
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/
22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
Svetoslav Ganov [Thu, 5 Nov 2015 02:25:32 +0000 (02:25 +0000)]
Merge "Take into account default app for default grants"
am:
82eeb2f20c
* commit '
82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
am:
035374d7a2
* commit '
035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:12 +0000 (02:19 +0000)]
Merge "Take into account default app for default grants"
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:00 +0000 (02:19 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
Svetoslav [Tue, 3 Nov 2015 02:40:18 +0000 (18:40 -0800)]
Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
Baligh Uddin [Wed, 4 Nov 2015 23:59:57 +0000 (15:59 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I20cf8ac4a5039ead0a65bd2e38ded78542a7a3e8
Baligh Uddin [Wed, 4 Nov 2015 23:36:55 +0000 (15:36 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I76a9ab65d1fe10e2915e5cd794a5cbce1697a933
Baligh Uddin [Wed, 4 Nov 2015 23:34:55 +0000 (15:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I924dde8b982ce94128882b484e9c3e9dc5c49013
Baligh Uddin [Wed, 4 Nov 2015 23:32:37 +0000 (15:32 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I76cc8d18dd82f9af09310685a88843eeb71a991c
Baligh Uddin [Wed, 4 Nov 2015 23:30:29 +0000 (15:30 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: Iec5d9e5b20c530e3056e2410af42fd8af8c16788
Baligh Uddin [Wed, 4 Nov 2015 23:28:25 +0000 (15:28 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I790f09439e904a82ed90ec07f6bbdab1e8ef42d8
Baligh Uddin [Wed, 4 Nov 2015 23:26:15 +0000 (15:26 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I87a141d9b4b2ac688432d52e1bbe15626b1f301b
Baligh Uddin [Wed, 4 Nov 2015 23:24:05 +0000 (15:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I31e759c6b0da2ecb71418aa3033f832a9ee42250
Chad Brubaker [Fri, 23 Oct 2015 22:33:56 +0000 (15:33 -0700)]
Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.
This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
certificate pinning.
* Policy on what to do with cleartext traffic.
In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.
This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.
Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
Baligh Uddin [Wed, 4 Nov 2015 19:56:04 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
Baligh Uddin [Wed, 4 Nov 2015 19:51:55 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I46efa0b9d7293d80c68cb6a1e21dfaa509c6d7d2
Glenn Kasten [Wed, 4 Nov 2015 16:10:44 +0000 (16:10 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
am:
ebbdabdb82
* commit '
ebbdabdb826c083769e7d7bc102a59a04c9e0329':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:03:41 +0000 (16:03 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
Alejandro Ochoa [Sat, 31 Oct 2015 02:05:00 +0000 (20:05 -0600)]
Built-in mic is not used when USB mic is disconnected
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).
Bug:
24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
Bill Yi [Tue, 3 Nov 2015 22:29:59 +0000 (14:29 -0800)]
Wale Ogunwale [Tue, 3 Nov 2015 15:13:24 +0000 (15:13 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
am:
7810aed854
* commit '
7810aed85408bddc4cc0c65e5be8d082c638d995':
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Wale Ogunwale [Tue, 3 Nov 2015 15:09:32 +0000 (15:09 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
joanne_chung [Mon, 2 Nov 2015 04:41:34 +0000 (12:41 +0800)]
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Symptom:
NullPointerException crash while call startNextMatchingActivity.
Root Cause:
Activity starts with FLAG_DEBUG_LOG_RESOLUTION for debug dump.
If the current Activity is the last object of resolves list,
we can not get the next Activity and aInfo is still null.
Solution:
Check null in debug log dump.
Change-Id: I4c5d14d9acd8d47768b36c95354763841579e050
Svetoslav [Tue, 3 Nov 2015 00:41:53 +0000 (16:41 -0800)]
Take into account default app for default grants
Use the correct API to query activities when granting
default permissions to ensure the preferred apps are
taken into account. This allows OEMs to customize which
app should get default permission grants if there is
more than one resolving to the query intent.
Change-Id: I047f22dfff773a2ba9de1a0144442e372607777c
Glenn Kasten [Mon, 2 Nov 2015 23:06:04 +0000 (23:06 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik"
am:
6079b990f1
* commit '
6079b990f1461011a9dedb47cc65db1ce062e199':
BluetoothMidiDevice: change write type to support JamStik
Glenn Kasten [Mon, 2 Nov 2015 23:04:42 +0000 (23:04 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService"
am:
5831944a6e
* commit '
5831944a6e99eff746e70d6ee9532ec3e3f32918':
BLE-MIDI: change binding for BluetoothMidiService
Glenn Kasten [Mon, 2 Nov 2015 23:03:18 +0000 (23:03 +0000)]
Merge "MidiBluetoothService: add new device to HashMap"
am:
9b07ba4bc3
* commit '
9b07ba4bc33319d6db8de173a24eb13b2d7f0b50':
MidiBluetoothService: add new device to HashMap
Glenn Kasten [Mon, 2 Nov 2015 23:01:49 +0000 (23:01 +0000)]
Merge "MidiManager: fix double BTLE callback"
am:
bbf34d0bd1
* commit '
bbf34d0bd1bc4f85c9af614291925f5da1fa0459':
MidiManager: fix double BTLE callback
Glenn Kasten [Mon, 2 Nov 2015 23:00:15 +0000 (23:00 +0000)]
Merge "MidiService: update listener with current status when registered"
am:
d4e9b9e4ac
* commit '
d4e9b9e4ac4196d37b0a5e59867f5a51018f4087':
MidiService: update listener with current status when registered
Glenn Kasten [Mon, 2 Nov 2015 22:51:29 +0000 (22:51 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik"
Glenn Kasten [Mon, 2 Nov 2015 22:51:18 +0000 (22:51 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService"
Glenn Kasten [Mon, 2 Nov 2015 22:51:12 +0000 (22:51 +0000)]
Merge "MidiBluetoothService: add new device to HashMap"
Glenn Kasten [Mon, 2 Nov 2015 22:51:02 +0000 (22:51 +0000)]
Merge "MidiManager: fix double BTLE callback"
Glenn Kasten [Mon, 2 Nov 2015 22:50:50 +0000 (22:50 +0000)]
Merge "MidiService: update listener with current status when registered"
Phil Burk [Tue, 22 Sep 2015 19:07:31 +0000 (12:07 -0700)]
BluetoothMidiDevice: change write type to support JamStik
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.
Bug:
24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
Phil Burk [Thu, 3 Sep 2015 21:37:03 +0000 (14:37 -0700)]
BLE-MIDI: change binding for BluetoothMidiService
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.
Bug:
23219556
Bug:
23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
Phil Burk [Fri, 21 Aug 2015 22:39:10 +0000 (15:39 -0700)]
MidiBluetoothService: add new device to HashMap
The HashMap is being used but devices never added to the map.
Bug:
23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
e5f722e55c5708c2b48b8c9688c135e451225032)
Phil Burk [Fri, 21 Aug 2015 22:22:35 +0000 (15:22 -0700)]
MidiManager: fix double BTLE callback
Stop openBluetoothDevice() from calling its callback twice.
Bug:
23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
Phil Burk [Thu, 6 Aug 2015 06:32:54 +0000 (23:32 -0700)]
MidiService: update listener with current status when registered
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.
Bug:
22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
b2355940e3e697deeecd1b6511cd5094f9dc553a)
Lorenzo Colitti [Thu, 29 Oct 2015 08:16:31 +0000 (08:16 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am:
a2cc04736d am:
e4aacaeec9
am:
c52503acf0
* commit '
c52503acf0a5e4140376391f57de539fbe60ea8f':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 08:09:27 +0000 (08:09 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am:
a2cc04736d
am:
e4aacaeec9
* commit '
e4aacaeec950691700d717efa894a7b51bc87fe2':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 08:02:31 +0000 (08:02 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev
am:
a2cc04736d
* commit '
a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 07:57:13 +0000 (07:57 +0000)]
Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev
Bryce Lee [Thu, 29 Oct 2015 07:23:06 +0000 (07:23 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am:
4636770f0d
am:
3b6f9f78cf
* commit '
3b6f9f78cf0ea09176250059653d05cf6a5282c4':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bryce Lee [Thu, 29 Oct 2015 07:16:07 +0000 (07:16 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
am:
4636770f0d
* commit '
4636770f0df6e91cd7fbdf01b958fbdda688db7a':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bryce Lee [Thu, 29 Oct 2015 07:10:15 +0000 (07:10 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
Lorenzo Colitti [Thu, 29 Oct 2015 06:21:54 +0000 (15:21 +0900)]
Don't crash if a DHCP server doesn't send the server ID option.
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.
Bug:
25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
Bryce Lee [Thu, 29 Oct 2015 05:21:54 +0000 (22:21 -0700)]
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bug:
25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
Bryce Lee [Thu, 29 Oct 2015 05:19:19 +0000 (05:19 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am:
0a80294c81
am:
2adf45bee0
* commit '
2adf45bee0b423fa6ca758b806a16b968c0a3c65':
Revert "Declare new interface for headset client bluetooth profile to query."
Bryce Lee [Thu, 29 Oct 2015 05:10:41 +0000 (05:10 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
am:
0a80294c81
* commit '
0a80294c81d86a8bcdc6545b6e31929645cab306':
Revert "Declare new interface for headset client bluetooth profile to query."
Bryce Lee [Thu, 29 Oct 2015 05:04:06 +0000 (05:04 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:58:38 +0000 (04:58 +0000)]
Revert "Declare new interface for headset client bluetooth profile to query."
This reverts commit
694251eaaa8ea70a9b0427d55e9ede437c83a6d5.
Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
Bryce Lee [Thu, 29 Oct 2015 04:53:01 +0000 (04:53 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am:
a841973dee
am:
8b4f21b108
* commit '
8b4f21b108828c08833767c1f3f908e1cd7f8477':
Declare new interface for headset client bluetooth profile to query.
Bryce Lee [Thu, 29 Oct 2015 04:45:09 +0000 (04:45 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
am:
a841973dee
* commit '
a841973deea9281bbb21035055918c0b0cb3230f':
Declare new interface for headset client bluetooth profile to query.
Bryce Lee [Thu, 29 Oct 2015 04:39:08 +0000 (04:39 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:06:27 +0000 (21:06 -0700)]
Declare new interface for headset client bluetooth profile to query.
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.
Bug:
25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
Svetoslav Ganov [Thu, 29 Oct 2015 01:33:09 +0000 (01:33 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am:
2658cb002a am:
35151fbc8b
am:
08d013d3a1
* commit '
08d013d3a1e6306533c2fae1a4581986ffc9a642':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:24:38 +0000 (01:24 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am:
2658cb002a
am:
35151fbc8b
* commit '
35151fbc8b028f6633f477fd36044032a03b2bff':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:16:46 +0000 (01:16 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am:
2658cb002a
* commit '
2658cb002abae9341c9a82bfeaed764ba5bf97c8':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
Anthony Hugh [Wed, 28 Oct 2015 18:38:32 +0000 (18:38 +0000)]
Merge "Update permission label strings" into cw-e-dev am:
b69cab65d1
am:
41579ff8fc
* commit '
41579ff8fc06ad655e158b1ab825624437489c83':
Update permission label strings
Anthony Hugh [Wed, 28 Oct 2015 18:29:06 +0000 (18:29 +0000)]
Merge "Update permission label strings" into cw-e-dev
am:
b69cab65d1
* commit '
b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
Update permission label strings
Anthony Hugh [Wed, 28 Oct 2015 18:22:41 +0000 (18:22 +0000)]
Merge "Update permission label strings" into cw-e-dev
Ching Tzung Lin [Wed, 28 Oct 2015 17:41:24 +0000 (17:41 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am:
36da2a208e
am:
c45009906a
* commit '
c45009906ade7b25b6c01c02113c044bd9290ffb':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
Ching Tzung Lin [Wed, 28 Oct 2015 17:33:03 +0000 (17:33 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
am:
36da2a208e
* commit '
36da2a208e253d0635bb569cb92ea0e11f489b4e':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
Ching Tzung Lin [Wed, 28 Oct 2015 17:25:24 +0000 (17:25 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
Geoff Mendal [Wed, 28 Oct 2015 15:00:44 +0000 (15:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
c7522c0b1c -s ours am:
d2b3815dda -s ours
am:
9aa91f99b2 -s ours
* commit '
9aa91f99b26ddac01c7045e1a18b6f0116b4eec7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:52:31 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
c7522c0b1c -s ours
am:
d2b3815dda -s ours
* commit '
d2b3815dda57702ebbd00a6422d21a52b0604dfa':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:43:38 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
c7522c0b1c -s ours
* commit '
c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:39:12 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
a4f0ea406d -s ours
am:
4c55431f51 -s ours
* commit '
4c55431f51a3c3c67b3234e4902e7fda5cb81c76':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:38:11 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 28 Oct 2015 14:37:31 +0000 (07:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Oct 2015 14:29:50 +0000 (14:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
a4f0ea406d -s ours
* commit '
a4f0ea406d9c4de166ec65541581666e782b3846':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:26:00 +0000 (14:26 +0000)]
Import translations. DO NOT MERGE am:
b8afc77c0a -s ours am:
7934d4e206 -s ours
am:
32076214a4 -s ours
* commit '
32076214a40a98553a7c634d8d8a8d1eb2efb625':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:22:47 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 28 Oct 2015 14:21:49 +0000 (07:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c1726898d50ea8971a12ddc9fe575615682f95d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Oct 2015 14:18:25 +0000 (14:18 +0000)]
Import translations. DO NOT MERGE am:
b8afc77c0a -s ours
am:
7934d4e206 -s ours
* commit '
7934d4e20603eb2aaa6f6041c932e9ef70b5612f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:11:00 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
b8afc77c0a -s ours
* commit '
b8afc77c0a20a5d4ff7d1afb060c474feeefb1fe':
Import translations. DO NOT MERGE
OSDN Git Service
