drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
231,888 Commits 1 Branch 0 Tags
Commit Graph

231888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lifu Tang
a2b74fd268 Fixed the build break 
Change-Id: I02ee9b3f44d79510f174a1041f28b9c60450aa9c
 2016-02-11 12:57:59 -08:00
Lifu Tang
120480f17a Optimized the memory consumption and renamed PRN 
Bug: 27058251
Change-Id: I2309943b1a4e7565868ed0f247b84edc631fbd59
 2016-02-11 11:29:40 -08:00
Geoff Mendal
d9eec15d84 Merge "Import translations. DO NOT MERGE" 2016-02-03 14:58:49 +00:00
Geoff Mendal
1f7b7aecbd Import translations. DO NOT MERGE 
Change-Id: I423629c9356693e4aa2fa8dfc9d32ff662e1d414
Auto-generated-cl: translation import
 2016-02-03 06:53:26 -08:00
Erik Kline
3d51d8bacc Ignore link properties updates when nothing actually changed. 
am: 6076cb0b85

* commit '6076cb0b859185b075d3a70655afb192d68d0774':
  Ignore link properties updates when nothing actually changed.
 2016-02-03 14:37:11 +00:00
Erik Kline
e5345d8603 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 14:34:03 +00:00
Erik Kline
d33e6232fe Partial unification of DHCPv4 and static IPv4 configuration codepaths 
am: 8deac7793c

* commit '8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
  Partial unification of DHCPv4 and static IPv4 configuration codepaths
 2016-02-03 14:29:32 +00:00
Erik Kline
e056b88755 Partial unification of DHCPv4 and static IPv4 configuration codepaths 
am: 8deac7793c

* commit '8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
  Partial unification of DHCPv4 and static IPv4 configuration codepaths
 2016-02-03 14:25:36 +00:00
Geoff Mendal
adf19a8402 Merge "Import translations. DO NOT MERGE" 2016-02-03 14:16:20 +00:00
Geoff Mendal
18e74d09d5 Import translations. DO NOT MERGE 
Change-Id: I6b612ab71f970dc349b0178e3c9f4008dbfbe1fa
Auto-generated-cl: translation import
 2016-02-03 06:13:05 -08:00
Youngsang Cho
5d30450389 Merge "TIF: call RecordingCallback.onConnected when SessionCallback.onConnected is called" 2016-02-03 14:11:12 +00:00
Leon Scroggins
5e4aa93df6 Merge "Lock SkBitmap before accessing color table" 2016-02-03 13:49:28 +00:00
Geoff Mendal
b630657362 Merge "Import translations. DO NOT MERGE" 2016-02-03 13:46:59 +00:00
Geoff Mendal
8b086bc92e Import translations. DO NOT MERGE 
Change-Id: Ie886d9dc699d739dc174690080dbbaeb7368c135
Auto-generated-cl: translation import
 2016-02-03 05:46:15 -08:00
Erik Kline
6076cb0b85 Ignore link properties updates when nothing actually changed. 
Change-Id: Ia3c0a652cb3b67707a5c5a0bb40f991ef1e6f777
 2016-02-03 22:42:54 +09:00
Erik Kline
8deac7793c Partial unification of DHCPv4 and static IPv4 configuration codepaths 
Change-Id: Ic796f9b7bb853a332175c34e0f557588efb6247a
 2016-02-03 22:42:53 +09:00
Geoff Mendal
0a2ca5e337 Merge "Import translations. DO NOT MERGE" 2016-02-03 13:38:55 +00:00
Geoff Mendal
8c0fe42f23 Merge "Import translations. DO NOT MERGE" 2016-02-03 13:32:36 +00:00
Geoff Mendal
7f12433559 Import translations. DO NOT MERGE 
Change-Id: Ifb2402466432bdd2e6ea28882ee595063ae48056
Auto-generated-cl: translation import
 2016-02-03 05:29:03 -08:00
Geoff Mendal
832d16d36e Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 13:25:15 +00:00
Geoff Mendal
3b50bd1825 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
 2016-02-03 13:22:07 +00:00
Geoff Mendal
4d39ddda68 Import translations. DO NOT MERGE 
Change-Id: Ic0a054fee74b73afa16574a0c16fc7bc926b2bf7
Auto-generated-cl: translation import
 2016-02-03 05:16:51 -08:00
Geoff Mendal
e1abb7d839 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
 2016-02-03 13:16:30 +00:00
Geoff Mendal
31f9e6fef6 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
 2016-02-03 13:07:41 +00:00
Geoff Mendal
b66ba941f5 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 13:05:48 +00:00
Robin Lee
8c1306e397 [Metrics] declare a constant for user credentials 
Bug: 22541933
Change-Id: I774f74f3dd21f242a821bb08db6c09a8fc668671
 2016-02-03 13:01:49 +00:00
Geoff Mendal
2b0b6c99c6 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
 2016-02-03 13:01:25 +00:00
Geoff Mendal
2cdc07efe7 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:56:49 +00:00
Geoff Mendal
9b4f0ffe4a 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
 2016-02-03 12:52:23 +00:00
Geoff Mendal
a1d19c3c17 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:52:08 +00:00
Geoff Mendal
a077a26a6c 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
 2016-02-03 12:47:59 +00:00
Geoff Mendal
f2bcd0f078 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:47:50 +00:00
Geoff Mendal
2463fe6e33 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
 2016-02-03 12:43:25 +00:00
Geoff Mendal
b0491fa321 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
 2016-02-03 12:41:58 +00:00
Geoff Mendal
a30dd6678a Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:37:14 +00:00
Geoff Mendal
a8f8e31723 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
 2016-02-03 12:34:19 +00:00
Geoff Mendal
1c1ce7b8ef 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
 2016-02-03 12:25:16 +00:00
Geoff Mendal
0fe67519b5 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:20:50 +00:00
Clara Bayarri
5b5bda42f0 Merge "Keyboard Shortcuts Helper: Use App name for default group" 2016-02-03 12:17:12 +00:00
Geoff Mendal
cd069cbba1 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
 2016-02-03 12:16:37 +00:00
Geoff Mendal
4d02660353 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:15:54 +00:00
Geoff Mendal
b4b86a2c23 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
 2016-02-03 12:12:57 +00:00
Geoff Mendal
7b22d466ff Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:12:08 +00:00
Geoff Mendal
92928035e0 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:07:59 +00:00
Geoff Mendal
51fb467bf0 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
 2016-02-03 12:07:42 +00:00
Geoff Mendal
e19db0fe70 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
 2016-02-03 12:03:36 +00:00
Geoff Mendal
1a3c252e3c Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 12:03:17 +00:00
Geoff Mendal
5ff9cd7d41 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
 2016-02-03 11:58:56 +00:00
Geoff Mendal
2eeb297469 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:58:11 +00:00
Geoff Mendal
6e701f7e56 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
 2016-02-03 11:55:09 +00:00