Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
221,333 Commits 3 Branches 0 Tags
7fa281c80fb3ccca6070291907ba536bca3ccca9
Commit Graph

221333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tenghui Zhu
7fa281c80f Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c am: 1c7fbe0efb am: d829ab7683 
am: dfaf23f846

* commit 'dfaf23f84669b2f45da892f49b2d8c07f161f7a2':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 21:18:00 +00:00
Joe LaPenna
754ea71379 Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE am: 88c7c3e080 -s ours am: efcb281bec -s ours 
am: bab8dfd793  -s ours

* commit 'bab8dfd79327309c042b234316813b2c867c9a2c':
  Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
 2015-11-05 21:16:44 +00:00
Baligh Uddin
e307eefc35 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 69cc50f1e8 -s ours 
am: 42facf05ce  -s ours

* commit '42facf05ce7a7b21667335bba2f942ca2eda873d':
  Import translations. DO NOT MERGE
 2015-11-05 21:15:27 +00:00
Baligh Uddin
951b094367 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 97bf3b5922 -s ours 
am: 82ab657901  -s ours

* commit '82ab657901ef66fba38c67d7c6589d22cc82e3dd':
  Import translations. DO NOT MERGE
 2015-11-05 21:14:15 +00:00
Baligh Uddin
56d9e6570c Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5495ee8a9b -s ours 
am: 967f81f5d7  -s ours

* commit '967f81f5d71312e0978ac72420a589a26f86e1ec':
  Import translations. DO NOT MERGE
 2015-11-05 21:13:05 +00:00
Baligh Uddin
4296f4cbe2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 57b7fa49ac -s ours 
am: 335a6c58af  -s ours

* commit '335a6c58afed1ba18e2b2676ef98236d02f19648':
  Import translations. DO NOT MERGE
 2015-11-05 21:11:44 +00:00
Baligh Uddin
13a4255b9e Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6be193d87e -s ours 
am: 251427a387  -s ours

* commit '251427a38785144d80374c64fc0e020bf661e95f':
  Import translations. DO NOT MERGE
 2015-11-05 21:10:28 +00:00
Baligh Uddin
2b1b48107a Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-05 21:09:39 +00:00
Baligh Uddin
22c84271a9 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: 2fd15d5e8c

* commit '2fd15d5e8c7dbefb49434670cc76a5b94899114c':
 2015-11-05 21:09:12 +00:00
Baligh Uddin
5864e720cb Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: 2fd15d5e8c

* commit '2fd15d5e8c7dbefb49434670cc76a5b94899114c':
 2015-11-05 21:08:07 +00:00
Baligh Uddin
8366f82d3b Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8019f49d08 -s ours 
am: 20abfb1089  -s ours

* commit '20abfb108985de51b380bdfe9501bf304841f622':
  Import translations. DO NOT MERGE
 2015-11-05 21:06:51 +00:00
Dan Albert
7a10a986c5 Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am: c74dd7fcb1 
am: 6ae3fe184c  -s ours

* commit '6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5':
  Use std::unique_ptr instead of UniquePtr.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
 2015-11-05 21:05:28 +00:00
Tenghui Zhu
dfaf23f846 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c am: 1c7fbe0efb 
am: d829ab7683

* commit 'd829ab76831a0c323f669385c54f666f8a91e4f1':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:27:43 +00:00
Tenghui Zhu
d829ab7683 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c 
am: 1c7fbe0efb

* commit '1c7fbe0efbabe5c15ba72e16053551a8fdae1b92':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:20:29 +00:00
Joe LaPenna
bab8dfd793 Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE am: 88c7c3e080 -s ours 
am: efcb281bec  -s ours

* commit 'efcb281bec4a5ec57815204c89c5666ed35f3bcc':
  Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
 2015-11-05 20:16:12 +00:00
Tenghui Zhu
1c7fbe0efb Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev 
am: 76d20b4a5c

* commit '76d20b4a5c6463235d9497b8018a38c059a6761c':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:13:05 +00:00
Joe LaPenna
efcb281bec Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE 
am: 88c7c3e080  -s ours

* commit '88c7c3e08051f4a2be8ee5194214678a07ff7f01':
  Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
 2015-11-05 20:09:17 +00:00
Baligh Uddin
42facf05ce Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 69cc50f1e8  -s ours

* commit '69cc50f1e881b80db9767ce7535fe58067ca4222':
  Import translations. DO NOT MERGE
 2015-11-05 20:07:40 +00:00
Baligh Uddin
429c5b93ff Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e1348a7fa9 -s ours 
am: dd6d2fa5c7  -s ours

* commit 'dd6d2fa5c78bc86d56321244fb2ac33e9f86c761':
  Import translations. DO NOT MERGE
 2015-11-05 20:07:28 +00:00
Baligh Uddin
82ab657901 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 97bf3b5922  -s ours

* commit '97bf3b5922df75ecf5cf8b13f9ba2f338acdaf82':
  Import translations. DO NOT MERGE
 2015-11-05 20:06:18 +00:00
Baligh Uddin
296b5e3fd4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2523c61fb7 -s ours 
am: 8613602592  -s ours

* commit '861360259234c33846d36ade8e90143d8c8eeecb':
  Import translations. DO NOT MERGE
 2015-11-05 20:06:07 +00:00
Tenghui Zhu
76d20b4a5c Merge "When the incoming light source is invalid, don't generate any shadow" into mnc-dr-dev 2015-11-05 20:05:37 +00:00
Baligh Uddin
3f6bdb554b Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-05 20:05:07 +00:00
Baligh Uddin
967f81f5d7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 5495ee8a9b  -s ours

* commit '5495ee8a9bc44bb396a7bd2886d02ba7fe8ac711':
  Import translations. DO NOT MERGE
 2015-11-05 20:04:58 +00:00
Baligh Uddin
05108c9b55 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: 501a7521f0

* commit '501a7521f04efc78337b43fba7493e68926dd372':
 2015-11-05 20:04:40 +00:00
Baligh Uddin
335a6c58af Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 57b7fa49ac  -s ours

* commit '57b7fa49ace8d715c471a3dc9af943b654ca09a3':
  Import translations. DO NOT MERGE
 2015-11-05 20:03:32 +00:00
Baligh Uddin
b8cb05626d Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: 501a7521f0

* commit '501a7521f04efc78337b43fba7493e68926dd372':
 2015-11-05 20:03:32 +00:00
Baligh Uddin
7422e6511f Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cfd3d76b91 -s ours 
am: 1c50ba0372  -s ours

* commit '1c50ba0372cfcdbff38aaed29ec9b8e4b1b29143':
  Import translations. DO NOT MERGE
 2015-11-05 20:02:15 +00:00
Baligh Uddin
251427a387 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 6be193d87e  -s ours

* commit '6be193d87e4d7e1d517c9066bd8e4e7579384980':
  Import translations. DO NOT MERGE
 2015-11-05 20:02:12 +00:00
Baligh Uddin
2fd15d5e8c Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-11-05 20:01:03 +00:00
Baligh Uddin
db58f9692a Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-05 20:01:02 +00:00
Baligh Uddin
20abfb1089 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 8019f49d08  -s ours

* commit '8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
  Import translations. DO NOT MERGE
 2015-11-05 20:00:34 +00:00
Baligh Uddin
7ed0e74e25 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c138df954f -s ours 
am: 22b41d07ff  -s ours

* commit '22b41d07ff7198f9c2bee4254c2f02a15128bd51':
  Import translations. DO NOT MERGE
 2015-11-05 20:00:26 +00:00
Baligh Uddin
e16764812b Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c138df954f -s ours 
am: 22b41d07ff  -s ours

* commit '22b41d07ff7198f9c2bee4254c2f02a15128bd51':
  Import translations. DO NOT MERGE
 2015-11-05 19:59:28 +00:00
Baligh Uddin
1af86d97df Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 8019f49d08  -s ours

* commit '8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
  Import translations. DO NOT MERGE
 2015-11-05 19:59:19 +00:00
Joe LaPenna
88c7c3e080 Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE 
Also remove DEBUG-related timeout changes to have consistent behavior.

BUG: 24247417
BUG: 25463669
BUG: 23753686

Change-Id: Icfbb1531173477f2649f7f99e3bef9860e5a9ec2
 2015-11-05 11:58:48 -08:00
Baligh Uddin
6095010f11 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-05 19:58:30 +00:00
Baligh Uddin
2068c29a6c Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: aa4dbe2d84 -s ours 
am: 010d1d1e15  -s ours

* commit '010d1d1e15eb0cad401e15bec4f9f0dac72fb56e':
  Import translations. DO NOT MERGE
 2015-11-05 19:58:02 +00:00
Baligh Uddin
0b0a50da88 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: aa4dbe2d84 -s ours 
am: 010d1d1e15  -s ours

* commit '010d1d1e15eb0cad401e15bec4f9f0dac72fb56e':
  Import translations. DO NOT MERGE
 2015-11-05 19:57:02 +00:00
Dan Albert
6ae3fe184c Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 
am: c74dd7fcb1

* commit 'c74dd7fcb128e9a1465c1a91a91a851c3386a955':
  Use std::unique_ptr instead of UniquePtr.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
 2015-11-05 19:56:57 +00:00
Baligh Uddin
dd6d2fa5c7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: e1348a7fa9  -s ours

* commit 'e1348a7fa983099ccc387ee41ae1056571f33f51':
  Import translations. DO NOT MERGE
 2015-11-05 19:55:32 +00:00
Baligh Uddin
d3e6514a85 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 70df552ac2 -s ours 
am: f61a22fe5d  -s ours

* commit 'f61a22fe5d974ee568ac5b547a45e93f2b0cbcb2':
  Import translations. DO NOT MERGE
 2015-11-05 19:54:53 +00:00
Baligh Uddin
8613602592 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 2523c61fb7  -s ours

* commit '2523c61fb78e9f6022b9762750842a65bcb224f3':
  Import translations. DO NOT MERGE
 2015-11-05 19:54:07 +00:00
Baligh Uddin
1bce3f21e0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 31f0d18a03 -s ours 
am: cb60be1c2a  -s ours

* commit 'cb60be1c2ab9ce4bd19250d544b2afb29a6e5f3d':
  Import translations. DO NOT MERGE
 2015-11-05 19:53:32 +00:00
Baligh Uddin
501a7521f0 Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 2015-11-05 19:53:11 +00:00
Baligh Uddin
1c50ba0372 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: cfd3d76b91  -s ours

* commit 'cfd3d76b9149baabf31339546e178b45cd44ca80':
  Import translations. DO NOT MERGE
 2015-11-05 19:52:40 +00:00
Baligh Uddin
b795cd860b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: cfd3d76b91  -s ours

* commit 'cfd3d76b9149baabf31339546e178b45cd44ca80':
  Import translations. DO NOT MERGE
 2015-11-05 19:51:44 +00:00
Baligh Uddin
22b41d07ff Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: c138df954f  -s ours

* commit 'c138df954f4ace40e722b9acbb2359d566da2147':
  Import translations. DO NOT MERGE
 2015-11-05 19:50:16 +00:00
Baligh Uddin
69cc50f1e8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:59 +00:00
Baligh Uddin
97bf3b5922 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:31 +00:00