OSDN Git Service
Doris Liu [Wed, 3 Feb 2016 19:10:49 +0000 (11:10 -0800)]
Fix NPE for invalid target exception
Change-Id: I57b319fae617792351c6ec9872c3b73cd25dc4e5
Derek Sollenberger [Wed, 3 Feb 2016 17:59:11 +0000 (17:59 +0000)]
Merge "Update Canvas API with view system calls."
Geoff Mendal [Wed, 3 Feb 2016 17:55:05 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 3 Feb 2016 17:53:27 +0000 (18:53 +0100)]
Import translations. DO NOT MERGE
Change-Id: Iad2ccbf1fef7c8ca217e78134a6fa66b738f97f8
Auto-generated-cl: translation import
Kenny Guy [Wed, 3 Feb 2016 17:45:03 +0000 (17:45 +0000)]
Merge "Match non-crypto aware admins when registering."
Geoff Mendal [Wed, 3 Feb 2016 17:18:44 +0000 (17:18 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 17:17:01 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
8152fbd7e9 -s ours
am:
f322b46028 -s ours
* commit '
f322b4602893a9cb3eae30ac0f4f196b3dc95176':
Import translations. DO NOT MERGE
Paul Jensen [Wed, 3 Feb 2016 17:16:58 +0000 (17:16 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Ben Kwa [Wed, 3 Feb 2016 17:12:53 +0000 (17:12 +0000)]
Merge "Lint fixes and config tweaks."
Paul Jensen [Wed, 3 Feb 2016 17:12:47 +0000 (17:12 +0000)]
Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev
am:
44307adcf3
* commit '
44307adcf371bacad4de6925a9207bdbfdc6f874':
Android packet filtering program interpreter test & program generator
Ben Kwa [Tue, 2 Feb 2016 20:11:10 +0000 (12:11 -0800)]
Lint fixes and config tweaks.
- Add recommended ignore properties to lint.xml.
- Make Fragment subclasses public.
- Truncate log tags at 23 chars.
- Fix one instance of passing a color ID instead of a color.
- Misc xml property fixes.
Change-Id: Ie8d6a8932cda72b7a239f6dfab56bd854f909820
Selim Gurun [Wed, 3 Feb 2016 17:09:09 +0000 (17:09 +0000)]
Merge "Make abiOverride attribute public"
Paul Jensen [Wed, 3 Feb 2016 16:48:43 +0000 (16:48 +0000)]
Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev
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
Geoff Mendal [Wed, 3 Feb 2016 16:40:29 +0000 (16:40 +0000)]
Import translations. DO NOT MERGE am:
a3144a52c6 -s ours am:
1a0c0953a0 -s ours
am:
04364c7464 -s ours
* commit '
04364c74640965e92fb48be2c9ba0f4d75e1f8bf':
Import translations. DO NOT MERGE
Florin Malita [Wed, 3 Feb 2016 16:29:22 +0000 (16:29 +0000)]
Merge "Remove remaining references to SkCanvas::SaveFlags"
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
Florin Malita [Wed, 3 Feb 2016 15:48:55 +0000 (10:48 -0500)]
Remove remaining references to SkCanvas::SaveFlags
One SkCanvas save flag reference snuck back in after the last
cleanup. Convert to the new SaveFlags enum.
Change-Id: I9ba4b01a19bbb80276c84d30fd0d7b9513892cf9
Geoff Mendal [Wed, 3 Feb 2016 15:44:40 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
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
Sudheer Shanka [Wed, 3 Feb 2016 15:31:55 +0000 (15:31 +0000)]
Merge "Add an utility method to get device owner."
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
Paul Jensen [Fri, 8 Jan 2016 04:13:19 +0000 (23:13 -0500)]
Android packet filtering program interpreter test & program generator
Change-Id: I17951bd6320b9eb3b6c43f2ae37f62c2025705c1
Geoff Mendal [Wed, 3 Feb 2016 14:58:49 +0000 (14:58 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Geoff Mendal [Wed, 3 Feb 2016 14:53:26 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I423629c9356693e4aa2fa8dfc9d32ff662e1d414
Auto-generated-cl: translation import
Erik Kline [Wed, 3 Feb 2016 14:37:11 +0000 (14:37 +0000)]
Ignore link properties updates when nothing actually changed.
am:
6076cb0b85
* commit '
6076cb0b859185b075d3a70655afb192d68d0774':
Ignore link properties updates when nothing actually changed.
Erik Kline [Wed, 3 Feb 2016 14:34:03 +0000 (14:34 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Erik Kline [Wed, 3 Feb 2016 14:29:32 +0000 (14:29 +0000)]
Partial unification of DHCPv4 and static IPv4 configuration codepaths
am:
8deac7793c
* commit '
8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
Partial unification of DHCPv4 and static IPv4 configuration codepaths
Erik Kline [Wed, 3 Feb 2016 14:25:36 +0000 (14:25 +0000)]
Partial unification of DHCPv4 and static IPv4 configuration codepaths
am:
8deac7793c
* commit '
8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
Partial unification of DHCPv4 and static IPv4 configuration codepaths
Kenny Guy [Wed, 3 Feb 2016 14:20:30 +0000 (14:20 +0000)]
Match non-crypto aware admins when registering.
Profile owners are registered before the user is
started and unlocked, so we need to check for
components that aren't cryptoware when looking
for the admin.
Bug:
26924254
Change-Id: I61fca0a3d6e490ca6fea9a7bdc8f2c44efde74f2
Geoff Mendal [Wed, 3 Feb 2016 14:16:20 +0000 (14:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 3 Feb 2016 14:13:05 +0000 (06:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6b612ab71f970dc349b0178e3c9f4008dbfbe1fa
Auto-generated-cl: translation import
Derek Sollenberger [Thu, 30 Jul 2015 14:00:39 +0000 (10:00 -0400)]
Update Canvas API with view system calls.
Refactor DisplayListCanvas, RecordingCanvas, and SkiaCanvas
to share a common API.
Change-Id: I0268ec2749ea5d13a3a72bb2784ed6a9911383d9
Youngsang Cho [Wed, 3 Feb 2016 14:11:12 +0000 (14:11 +0000)]
Merge "TIF: call RecordingCallback.onConnected when SessionCallback.onConnected is called"
Leon Scroggins [Wed, 3 Feb 2016 13:49:28 +0000 (13:49 +0000)]
Merge "Lock SkBitmap before accessing color table"
Geoff Mendal [Wed, 3 Feb 2016 13:46:59 +0000 (13:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 3 Feb 2016 13:46:15 +0000 (05:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie886d9dc699d739dc174690080dbbaeb7368c135
Auto-generated-cl: translation import
Erik Kline [Wed, 3 Feb 2016 10:39:01 +0000 (19:39 +0900)]
Ignore link properties updates when nothing actually changed.
Change-Id: Ia3c0a652cb3b67707a5c5a0bb40f991ef1e6f777
Erik Kline [Wed, 3 Feb 2016 10:34:47 +0000 (19:34 +0900)]
Partial unification of DHCPv4 and static IPv4 configuration codepaths
Change-Id: Ic796f9b7bb853a332175c34e0f557588efb6247a
Geoff Mendal [Wed, 3 Feb 2016 13:38:55 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 3 Feb 2016 13:32:36 +0000 (13:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 3 Feb 2016 13:29:03 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb2402466432bdd2e6ea28882ee595063ae48056
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 13:25:15 +0000 (13:25 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 13:22:07 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
d3f6510b6f -s ours
am:
04defe7b2f -s ours
* commit '
04defe7b2f8ebeb931f72b51c206e113adc39ed2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 13:16:51 +0000 (05:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic0a054fee74b73afa16574a0c16fc7bc926b2bf7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 13:16:30 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
d3f6510b6f -s ours
am:
04defe7b2f -s ours
* commit '
04defe7b2f8ebeb931f72b51c206e113adc39ed2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 13:07:41 +0000 (13:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
7c5cf65b83 -s ours
am:
f445067f52 -s ours
* commit '
f445067f52ca6ff9f16da32cdcd81e32eeffd51d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 13:05:48 +0000 (13:05 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Robin Lee [Mon, 1 Feb 2016 11:37:02 +0000 (11:37 +0000)]
[Metrics] declare a constant for user credentials
Bug:
22541933
Change-Id: I774f74f3dd21f242a821bb08db6c09a8fc668671
Geoff Mendal [Wed, 3 Feb 2016 13:01:25 +0000 (13:01 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
e8f321c778 -s ours
am:
acbdeaba70 -s ours
* commit '
acbdeaba7031df87d8c30e3efadbe832fd4f9ea9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:56:49 +0000 (12:56 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 12:52:23 +0000 (12:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
091a828fb5 -s ours
am:
b73c44bbcc -s ours
* commit '
b73c44bbcc43526281b0a031b1cb416d59245616':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:52:08 +0000 (12:52 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 12:47:59 +0000 (12:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
091a828fb5 -s ours
am:
b73c44bbcc -s ours
* commit '
b73c44bbcc43526281b0a031b1cb416d59245616':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:47:50 +0000 (12:47 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 12:43:25 +0000 (12:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
f47a2c9fb9 -s ours
am:
02171a04a6 -s ours
* commit '
02171a04a6d416f6c769c79174548a83cd564027':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:41:58 +0000 (12:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
f47a2c9fb9 -s ours
am:
02171a04a6 -s ours
* commit '
02171a04a6d416f6c769c79174548a83cd564027':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:37:14 +0000 (12:37 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 12:34:19 +0000 (12:34 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
762829795f -s ours
am:
77ceede11b -s ours
* commit '
77ceede11b89918f649b4f6d5aca98cee55569fd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:25:16 +0000 (12:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
762829795f -s ours
am:
77ceede11b -s ours
* commit '
77ceede11b89918f649b4f6d5aca98cee55569fd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:20:50 +0000 (12:20 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Clara Bayarri [Wed, 3 Feb 2016 12:17:12 +0000 (12:17 +0000)]
Merge "Keyboard Shortcuts Helper: Use App name for default group"
Geoff Mendal [Wed, 3 Feb 2016 12:16:37 +0000 (12:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
fd92981842 -s ours
am:
e7dccbd97c -s ours
* commit '
e7dccbd97ce742cf3ec63179804aff8367618c32':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:15:54 +0000 (12:15 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 12:12:57 +0000 (12:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
45267b2f06 -s ours
am:
892160a1c5 -s ours
* commit '
892160a1c53265207878c199f0dbdc7a524979d3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:12:08 +0000 (12:12 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 12:07:59 +0000 (12:07 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 12:07:42 +0000 (12:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
45267b2f06 -s ours
am:
892160a1c5 -s ours
* commit '
892160a1c53265207878c199f0dbdc7a524979d3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:03:36 +0000 (12:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
38f33925f8 -s ours
am:
0ba5990d99 -s ours
* commit '
0ba5990d99fe96e5c6c1b864c4a23899be8b258a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 12:03:17 +0000 (12:03 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 11:58:56 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
38f33925f8 -s ours
am:
0ba5990d99 -s ours
* commit '
0ba5990d99fe96e5c6c1b864c4a23899be8b258a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:58:11 +0000 (11:58 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 11:55:09 +0000 (11:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
e6faf1a713 -s ours
am:
f80ebaf32e -s ours
* commit '
f80ebaf32e4950bf0b2cd15c0a09a94ccfaa2c6c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:54:16 +0000 (11:54 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 11:50:07 +0000 (11:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
e6faf1a713 -s ours
am:
f80ebaf32e -s ours
* commit '
f80ebaf32e4950bf0b2cd15c0a09a94ccfaa2c6c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:49:12 +0000 (11:49 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
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
Clara Bayarri [Tue, 2 Feb 2016 18:08:01 +0000 (18:08 +0000)]
Keyboard Shortcuts Helper: Use App name for default group
Change-Id: I802dd6c9dcc838b9f06b29b99dc47dd93634d98b
Geoff Mendal [Wed, 3 Feb 2016 11:44:51 +0000 (11:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
fba9bae4d1 -s ours
am:
4b4d63c3a5 -s ours
* commit '
4b4d63c3a52d7083fb52f116aecae33e97240a2f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:41:05 +0000 (11:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
fba9bae4d1 -s ours
am:
4b4d63c3a5 -s ours
* commit '
4b4d63c3a52d7083fb52f116aecae33e97240a2f':
Import translations. DO NOT MERGE
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
Geoff Mendal [Wed, 3 Feb 2016 11:36:34 +0000 (11:36 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 11:32:37 +0000 (11:32 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 11:32:12 +0000 (11:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
6779c7d415 -s ours
am:
87c4199600 -s ours
* commit '
87c4199600dcc6933abffa8bc9c04abf52483575':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:29:36 +0000 (11:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
6779c7d415 -s ours
am:
87c4199600 -s ours
* commit '
87c4199600dcc6933abffa8bc9c04abf52483575':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:29:03 +0000 (11:29 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
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
Geoff Mendal [Wed, 3 Feb 2016 11:25:16 +0000 (11:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
c0297abd93 -s ours am:
768b07ca66 -s ours
am:
4c3e6f2a53 -s ours
* commit '
4c3e6f2a53d4815da8fdaf7431bc8091561551a7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:22:48 +0000 (11:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
c0297abd93 -s ours am:
768b07ca66 -s ours
am:
4c3e6f2a53 -s ours
* commit '
4c3e6f2a53d4815da8fdaf7431bc8091561551a7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:21:15 +0000 (11:21 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 11:19:55 +0000 (11:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
4a27667bf5 -s ours am:
b1be124b15 -s ours
am:
3350974f82 -s ours
* commit '
3350974f82c7743e204d57f5f19b554e67bdad63':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 11:18:49 +0000 (11:18 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Wed, 3 Feb 2016 11:17:36 +0000 (11:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
4a27667bf5 -s ours am:
b1be124b15 -s ours
am:
3350974f82 -s ours
* commit '
3350974f82c7743e204d57f5f19b554e67bdad63':
Import translations. DO NOT MERGE
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
Geoff Mendal [Wed, 3 Feb 2016 11:16:29 +0000 (11:16 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
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
Geoff Mendal [Wed, 3 Feb 2016 11:11:14 +0000 (11:11 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
091513d6e8 -s ours am:
a0159dfc08 -s ours
am:
b8758b39a9 -s ours
* commit '
b8758b39a937ed5b77ab90d5a446445741084b2e':
Import translations. DO NOT MERGE
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
Geoff Mendal [Wed, 3 Feb 2016 11:08:48 +0000 (11:08 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
091513d6e8 -s ours am:
a0159dfc08 -s ours
am:
b8758b39a9 -s ours
* commit '
b8758b39a937ed5b77ab90d5a446445741084b2e':
Import translations. DO NOT MERGE