Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
258,075 Commits 3 Branches 0 Tags
165784c49ed33f18e096fb180d8d622bb8fc2bbd
Commit Graph

258075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
165784c49e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours 
am: 498f780f42  -s ours

* commit '498f780f42d39906ef634abada86eb750ce24fbb':
  Import translations. DO NOT MERGE

Change-Id: I337ee1c7c33a89158126caa18813642e954229e5
 2016-06-03 17:23:48 +00:00
Bill Yi
18f07fd061 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours 
am: 7d627e9cf0  -s ours

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

Change-Id: I75a2eb02c5ea1f26186f65a524942e2227908099
 2016-06-03 17:23:44 +00:00
Bill Yi
536351ebbd Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours 
am: c29b39b95f  -s ours

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

Change-Id: I7ada5df98e9d67b7991e73000c5c8cc885a8ff71
 2016-06-03 17:23:42 +00:00
Bill Yi
1400ea56b0 Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours 
am: 5c2575071e  -s ours

* commit '5c2575071e95e8efbb73f1a78f8dc382eda6e453':
  Import translations. DO NOT MERGE

Change-Id: I876ee6b17f993d8ef7ede529c8bf7118abc80439
 2016-06-03 17:13:09 +00:00
Bill Yi
479e4ebae4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours 
am: bcd2ea35c0  -s ours

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

Change-Id: I24dc4ae1290f9bd92b82793ebb394df6adab4a2a
 2016-06-03 17:13:08 +00:00
Bill Yi
2e03e4651a Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours 
am: f089201e2e  -s ours

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

Change-Id: I5b1436cfb9cb51a6be47e6e7c52556727f8811e5
 2016-06-03 17:13:04 +00:00
Bill Yi
650a2aad33 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours 
am: 67ae5a2251  -s ours

* commit '67ae5a22517ff68547171588c09ae9ce3e95080b':
  Import translations. DO NOT MERGE

Change-Id: Iab1bf41b422aa0e7bd8508b2c7afb288f6413497
 2016-06-03 17:13:02 +00:00
Bill Yi
83680a1c3d Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours 
am: 479f70c516  -s ours

* commit '479f70c5167806d916bceb7f241227f90ccd3242':
  Import translations. DO NOT MERGE

Change-Id: I122d411f09df424963f85f9c75b2f2abec92456e
 2016-06-03 17:13:01 +00:00
Bill Yi
498f780f42 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 31cd8615b2  -s ours

* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
  Import translations. DO NOT MERGE

Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508
 2016-06-03 17:12:42 +00:00
Bill Yi
7d627e9cf0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 52edfafb9c  -s ours

* commit '52edfafb9c53d14a5e1de1ecdd3d5b735cecf711':
  Import translations. DO NOT MERGE

Change-Id: I4ef01eea310877c5201b9c2e44c9f49948aeb1f1
 2016-06-03 17:12:38 +00:00
Bill Yi
c29b39b95f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f79616b427  -s ours

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

Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f
 2016-06-03 17:12:33 +00:00
Bill Yi
711de8ebe8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 9d41bf11df  -s ours

* commit '9d41bf11dfbf2e239babedd580c2fa45aef036d7':
  Import translations. DO NOT MERGE

Change-Id: I54cc8b7c4d7dde1567661beb2055e0c3e7011c2f
 2016-06-03 17:05:19 +00:00
Bill Yi
1c568804d4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: e30eb8b3ba  -s ours

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

Change-Id: I9c3b3fe14de85880737f58a67b649b90685121aa
 2016-06-03 17:05:15 +00:00
Bill Yi
7ef5df0ba4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: c31029409a  -s ours

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

Change-Id: I72a678ae2aa88ee246fbc5ed276fdcd3d52eaa33
 2016-06-03 17:05:11 +00:00
Bill Yi
05b2250d54 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: b51541753a  -s ours

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

Change-Id: I63d94012dae2053fa343ad5ffc0bf0751a46e6b5
 2016-06-03 17:05:07 +00:00
Bill Yi
b53c4e68ec Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 4233404ee4  -s ours

* commit '4233404ee4f33a55dcee898939d19b78e4b027c8':
  Import translations. DO NOT MERGE

Change-Id: I02e0874f7a79ff45eca3498340e7d19b9d0cdd28
 2016-06-03 17:05:04 +00:00
Bill Yi
5c2575071e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a68d1f10e2  -s ours

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

Change-Id: Ic08e6e8dcb28ab89c072abe20633c71d7695277e
 2016-06-03 17:04:14 +00:00
Bill Yi
bcd2ea35c0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2130b28754  -s ours

* commit '2130b287549b010b405bc72d04f07fb1bd070ba5':
  Import translations. DO NOT MERGE

Change-Id: Ib9e163aa0e74fdd6c9b22c292e9651d153e117a4
 2016-06-03 17:04:08 +00:00
Bill Yi
f089201e2e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ef2989920d  -s ours

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

Change-Id: I4c4da499fab8a30733235849a336876442e46125
 2016-06-03 17:04:02 +00:00
Bill Yi
67ae5a2251 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 3d9d9fa0d9  -s ours

* commit '3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
  Import translations. DO NOT MERGE

Change-Id: I02a8d1407296ab018dab851a235fce0c8c75013c
 2016-06-03 17:03:59 +00:00
Bill Yi
479f70c516 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cace07e727  -s ours

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

Change-Id: I7b6473f40f64a17b4f7417cf28c1e24d36a9c3ff
 2016-06-03 17:03:50 +00:00
TreeHugger Robot
31cd8615b2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:51 +00:00
TreeHugger Robot
52edfafb9c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:27 +00:00
TreeHugger Robot
f79616b427 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:57:50 +00:00
TreeHugger Robot
9d41bf11df Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:56:41 +00:00
TreeHugger Robot
a68d1f10e2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:56:16 +00:00
TreeHugger Robot
2130b28754 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:58 +00:00
TreeHugger Robot
e30eb8b3ba Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:55:39 +00:00
TreeHugger Robot
c31029409a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:55:21 +00:00
TreeHugger Robot
ef2989920d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:03 +00:00
TreeHugger Robot
3d9d9fa0d9 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:54:40 +00:00
TreeHugger Robot
b51541753a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:53:48 +00:00
TreeHugger Robot
4233404ee4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:53:29 +00:00
TreeHugger Robot
cace07e727 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:53:13 +00:00
Robert Greenwalt
c4e25b26de Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev 
am: 6a5c9560a3

* commit '6a5c9560a33337fc82362d77bc4bae633953428d':
  Add support for UNSOL PCO Data.

Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
 2016-06-03 16:44:29 +00:00
Robert Greenwalt
6a5c9560a3 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev 2016-06-03 16:38:58 +00:00
Android Build Merger (Role)
c53e13654e Merge "Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc am: d49a86ceda" into nyc-mr1-dev-plus-aosp 2016-06-03 16:14:16 +00:00
Adrian Roos
3c8c89db25 Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc 
am: 50844bc504

* commit '50844bc50429e6e6f4f0d33b177491c25f47e6ce':
  Fix BigText transitions

Change-Id: I822241014f796954ee80e5d3ad2ba747f2ef1f03
 2016-06-03 16:13:46 +00:00
Adrian Roos
f5ea88432a Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc 
am: d49a86ceda

* commit 'd49a86ceda243515019d267d4fbecc3cc99cb456':
  Fix BigText transitions

Change-Id: Ife5601ffb5323f73e817881d47a7ead1c89f2504
 2016-06-03 16:13:44 +00:00
Adrian Roos
50844bc504 Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
 2016-06-03 15:53:09 +00:00
Adrian Roos
d49a86ceda Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
 2016-06-03 15:53:07 +00:00
Makoto Onuki
51c7ce7531 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 
am: 37087ad710

* commit '37087ad710087755786c115508b14e053c47f882':
  ShortcutManager: Implement usage report API

Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
 2016-06-03 15:37:10 +00:00
TreeHugger Robot
2ab4f451dc Merge "Fix BigText transitions" into nyc-dev 2016-06-03 15:36:11 +00:00
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Android Build Merger (Role)
68863004b7 Merge "Don\'t leak guts. am: cdf98e1964 am: 08cc30378c" into nyc-mr1-dev-plus-aosp 2016-06-03 13:47:13 +00:00
Julia Reynolds
1f8275e314 Don\'t leak guts. am: cdf98e1964 
am: 0853233433

* commit '0853233433958eb9c97d8237341be58895e8a541':
  Don't leak guts.

Change-Id: Ifa768e26b323a46cd595feebaec2e947415b938e
 2016-06-03 13:46:47 +00:00
Julia Reynolds
9561af35f2 Don\'t leak guts. am: cdf98e1964 
am: 08cc30378c

* commit '08cc30378c12c47250ab05491346d940194a29f8':
  Don't leak guts.

Change-Id: Ieea32af97aef5a75633112bb15bf6d6453080dab
 2016-06-03 13:46:43 +00:00
Julia Reynolds
08cc30378c Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
 2016-06-03 13:33:11 +00:00
Julia Reynolds
0853233433 Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: Id7e53a4e108280c8b843413fa377ae40ea0acb2e
 2016-06-03 13:33:08 +00:00
Julia Reynolds
cdf98e1964 Don't leak guts. 
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes: 29064258
 2016-06-03 13:17:47 +00:00