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

231864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Geoff Mendal
a3ba0e083e Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:54:16 +00:00
Geoff Mendal
a42188fe73 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:50:07 +00:00
Geoff Mendal
31500b4101 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:49:12 +00:00
Geoff Mendal
04defe7b2f Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: d3f6510b6f  -s ours

* commit 'd3f6510b6ff8e91ddd3450804460bc91f67676cf':
  Import translations. DO NOT MERGE
 2016-02-03 11:45:43 +00:00
Clara Bayarri
ada88b36af Keyboard Shortcuts Helper: Use App name for default group 
Change-Id: I802dd6c9dcc838b9f06b29b99dc47dd93634d98b
 2016-02-03 11:45:20 +00:00
Geoff Mendal
eee332b204 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
 2016-02-03 11:44:51 +00:00
Geoff Mendal
832cc3a12a 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
 2016-02-03 11:41:05 +00:00
Geoff Mendal
f445067f52 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 7c5cf65b83  -s ours

* commit '7c5cf65b83b84c236c0e156c100c2af3b9300c08':
  Import translations. DO NOT MERGE
 2016-02-03 11:37:19 +00:00
Geoff Mendal
95c82f2f9e Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:36:34 +00:00
Geoff Mendal
9f015d0e9d Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:32:37 +00:00
Geoff Mendal
aff64fde4e 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
 2016-02-03 11:32:12 +00:00
Geoff Mendal
b4225b28e7 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
 2016-02-03 11:29:36 +00:00
Geoff Mendal
26cf8afe74 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:29:03 +00:00
Geoff Mendal
acbdeaba70 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: e8f321c778  -s ours

* commit 'e8f321c7788a6ee717e43600ff095bf608c92946':
  Import translations. DO NOT MERGE
 2016-02-03 11:28:31 +00:00
Geoff Mendal
8614bf473b 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
 2016-02-03 11:25:16 +00:00
Geoff Mendal
8f8ba83ce9 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
 2016-02-03 11:22:48 +00:00
Geoff Mendal
392ddc6702 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:21:15 +00:00
Geoff Mendal
4ab87574b3 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
 2016-02-03 11:19:55 +00:00
Geoff Mendal
840e7982cd Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:18:49 +00:00
Geoff Mendal
939fea5049 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
 2016-02-03 11:17:36 +00:00
Geoff Mendal
b73c44bbcc Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 091a828fb5  -s ours

* commit '091a828fb5220d367124bd72a3e2c020e8200feb':
  Import translations. DO NOT MERGE
 2016-02-03 11:17:26 +00:00
Geoff Mendal
8c933ff53d Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 11:16:29 +00:00