Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,617 Commits 3 Branches 0 Tags
9136f4f6ce11f617ff2047faae7fca23ff275af3
Commit Graph

266617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavlin Radoslavov
9136f4f6ce resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp am: 950abbd075 
am: 0b78b922dc

* commit '0b78b922dc405d7f77a0ed0e3b5b1a03941b348b':
  While turning OFF do not honor ON requests.

Change-Id: I6839b7f01ebef00a7eb331842bc943617ec11cef
 2016-06-03 19:15:58 +00:00
Bill Yi
bd398d6c27 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp 
am: 90ac2096fc  -s ours

* commit '90ac2096fc0d00472f2d66600e98fdbf5799d1b0':
  Import translations. DO NOT MERGE

Change-Id: If8e806fe46665e21fa24853dd4bd85c7c48aa0e0
 2016-06-03 18:51:52 +00:00
Bill Yi
f604fec47f Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: cc44ccf2f9 -s ours 
am: 1f914332aa  -s ours

* commit '1f914332aa056c6902d3f8dda7025422ed38958b':

Change-Id: I9744fb39f54d9770c103f919499c90bae95e4544
 2016-06-03 18:51:48 +00:00
Bill Yi
a8420151b6 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours am: 6c4a3962e7 -s ours 
am: f21ed271f6  -s ours

* commit 'f21ed271f60183c55290b6a82d1ad60a8ed6228c':

Change-Id: I19ff40313b8b5eef2df298ae41acc71def6e6972
 2016-06-03 18:51:45 +00:00
Sanket Agarwal
0b78b922dc resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp 
am: 950abbd075

* commit '950abbd0751e863364a1ad976713a959bcb2dc8c':
  While turning OFF do not honor ON requests.

Change-Id: I5bbda2536bd0f33dad2d2b07b24acfb91f27a1ce
 2016-06-03 18:49:24 +00:00
Bill Yi
9103508a09 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: 27bdfbf794 -s ours 
am: e55d263d7a  -s ours

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

Change-Id: Iaf7100da143955d62ad5f820d8cb52e2be861322
 2016-06-03 18:34:04 +00:00
Bill Yi
056314c09f Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours am: 373ad6f5a1 -s ours 
am: 0957435430  -s ours

* commit '0957435430e5aa68a904069b15f4c43f9e05e14c':
  Import translations. DO NOT MERGE

Change-Id: I84d25c70b06928294aa13a00dad35858570a6157
 2016-06-03 18:34:00 +00:00
Eino-Ville Talvala
dfba35f54d Merge "Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 564dc9d0f7" into nyc-mr1-dev-plus-aosp 
am: 2d49475635

* commit '2d49475635fb1451de7fb33ef541a64e10fc4414':

Change-Id: I53dedcc3a7ad5da5bd6ffbbfd36aae4dcce2f894
 2016-06-03 18:33:50 +00:00
Android Build Merger (Role)
90ac2096fc Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-03 18:33:18 +00:00
Bill Yi
ac11fa51e6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 2e032b7463  -s ours

* commit '2e032b7463bef48b88cd18f2c5b8501a0d80b9ce':
  Import translations. DO NOT MERGE

Change-Id: Ia90dbc3d86b317621b525665a9817cd41b8d497f
 2016-06-03 18:32:44 +00:00
Bill Yi
1f914332aa Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours 
am: cc44ccf2f9  -s ours

* commit 'cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf':

Change-Id: I396bbeaa1a0ead5999e96991cdc7471ab0cd283d
 2016-06-03 18:32:27 +00:00
Bill Yi
f21ed271f6 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours 
am: 6c4a3962e7  -s ours

* commit '6c4a3962e7090451da516c56a6da0b3c816e046d':

Change-Id: Id92c6f1f23c7f97d5c312a1df8910b5a30bede61
 2016-06-03 18:32:22 +00:00
Eino-Ville Talvala
bb133d595a Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 02c43050af 
am: 33c4afd13b

* commit '33c4afd13bd7875d598ebb1b0851ea06f07bf831':
  Camera2: Update lensShadingMap documentation

Change-Id: I4fc3e9d505bcb55b0a88f1056ed84a98140eb2fd
 2016-06-03 18:17:36 +00:00
Bill Yi
e55d263d7a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours 
am: 27bdfbf794  -s ours

* commit '27bdfbf7946eb3e3b760169f85189168eebe60f6':
  Import translations. DO NOT MERGE

Change-Id: If07970d05f867718116d0c3aebebad92a9840a12
 2016-06-03 18:16:07 +00:00
Bill Yi
0957435430 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours 
am: 373ad6f5a1  -s ours

* commit '373ad6f5a1f0e98516a713423302b73a0d82f191':
  Import translations. DO NOT MERGE

Change-Id: I5498cfed6c0e6e4453c38b1f81969d9ca4e1c4b2
 2016-06-03 18:15:58 +00:00
Android Build Merger (Role)
2d49475635 Merge "Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 564dc9d0f7" into nyc-mr1-dev-plus-aosp 2016-06-03 18:12:48 +00:00
Pavlin Radoslavov
950abbd075 resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp 
Change-Id: I93f0fc1c427b02b0c864901f0a55e4cfaba35032
 2016-06-03 11:12:17 -07:00
TreeHugger Robot
2e032b7463 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 18:10:17 +00:00
Eino-Ville Talvala
9afeccad95 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe 
am: 564dc9d0f7

* commit '564dc9d0f7ef869a61b8825d844d7812fdb6f058':
  Camera2: Update lensShadingMap documentation

Change-Id: I2ae7341a799cd78749f3c5b460f48b693780b03b
 2016-06-03 18:10:09 +00:00
Eino-Ville Talvala
33c4afd13b Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe 
am: 02c43050af

* commit '02c43050af6fb528882af36d5f867abe071eebf0':
  Camera2: Update lensShadingMap documentation

Change-Id: If3dbbf28d8024a10f1cd8dc0d93a0a04178474dd
 2016-06-03 18:09:32 +00:00
Bill Yi
27bdfbf794 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 10e29e0730  -s ours

* commit '10e29e0730c21cb8a2cfe74b43792fa3a5705195':
  Import translations. DO NOT MERGE

Change-Id: I52252de40753f1e8b6bc38f738f5385bd1168f73
 2016-06-03 18:02:46 +00:00
Bill Yi
373ad6f5a1 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93bc210b3f  -s ours

* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
  Import translations. DO NOT MERGE

Change-Id: If8c66d039bb6cb91fad5011c0f63ca309a80af15
 2016-06-03 18:02:42 +00:00
Eino-Ville Talvala
02c43050af Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: I8011b348ebc133ab6664db5948066ded857d5285
 2016-06-03 18:01:57 +00:00
Bill Yi
cc44ccf2f9 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 10e29e0730  -s ours

* commit '10e29e0730c21cb8a2cfe74b43792fa3a5705195':
  Import translations. DO NOT MERGE

Change-Id: Ic4105391ce9541d9073b45d7c5d69b4e2f2bcae5
 2016-06-03 17:59:12 +00:00
Bill Yi
6c4a3962e7 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93bc210b3f  -s ours

* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
  Import translations. DO NOT MERGE

Change-Id: Ia8b0a47a38207e1d2c85f97f0e771281512d1e9c
 2016-06-03 17:59:06 +00:00
Eino-Ville Talvala
564dc9d0f7 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: If6a354fb827e650e97be7023ba9e44058a415b63
 2016-06-03 17:57:30 +00:00
Android Build Merger (Role)
0208df03d8 Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 2a098206c4 am: 2590281320" 2016-06-03 17:56:24 +00:00
Android Build Merger (Role)
5ffb1a08f2 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 1bef62e488 -s ours am: 166d6e9254 -s ours" 2016-06-03 17:56:12 +00:00
Doris Liu
204550983a Merge "Add additional type check for animating along a path" 2016-06-03 17:56:09 +00:00
TreeHugger Robot
10e29e0730 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:54:21 +00:00
Sudheer Shanka
ced9a42f4a Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 2a098206c4 
am: 2590281320

* commit '25902813203008c300e8beebaaba8ff5e44433b6':

Change-Id: I8ad5e3fb254e3f8c148e85a705c24165f8857712
 2016-06-03 17:53:45 +00:00
Bill Yi
d56091256c Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 1bef62e488 -s ours 
am: 166d6e9254  -s ours

* commit '166d6e92547de8985f131dd82db529a8ffe6e67a':

Change-Id: I6eaef955158660328093e65ad1fe1dd3effc3047
 2016-06-03 17:53:33 +00:00
Bill Yi
21ea400657 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 85e1b30a61 -s ours 
am: 2a9bf18182  -s ours

* commit '2a9bf18182743823b2f38c13119f020c1d616925':

Change-Id: I004978983532e5eea12cbc962d4f7f24056bad23
 2016-06-03 17:53:30 +00:00
TreeHugger Robot
93bc210b3f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:53:28 +00:00
Bill Yi
00c6b8f802 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours am: d5d030af8b -s ours 
am: 3008905af3  -s ours

* commit '3008905af3e4d5e7d7827014031a50188049638b':

Change-Id: I2c8651d3c53f925947d73785385e49ba0fe5693d
 2016-06-03 17:53:26 +00:00
Bill Yi
5dbddf83c4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: 88fdea080f -s ours 
am: d4983475ad  -s ours

* commit 'd4983475ad4154894a280c703a3a9eb3a530db3e':

Change-Id: I828546537e996ead723b4f7c991255f5387ca026
 2016-06-03 17:53:23 +00:00
Eino-Ville Talvala
cd44a32dfe Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 2016-06-03 17:51:19 +00:00
Sanket Agarwal
9eb774054e Merge "While turning OFF do not honor ON requests." 
am: 104518e4c4

* commit '104518e4c430e6e9a6bad44b9f18086d3c6f60fe':
  While turning OFF do not honor ON requests.

Change-Id: I7ca5d9592444d5a6ed4fd4dc635d871c60ba8ec0
 2016-06-03 17:50:15 +00:00
Bill Yi
9544b695cc Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours am: abd7b12ada -s ours 
am: ee5dd4e899  -s ours

* commit 'ee5dd4e899262f89c53b71a6f14bed53d0060426':

Change-Id: I33b90afa3448c8ea8cd5f757e9aa6400dea8ceed
 2016-06-03 17:45:54 +00:00
Bill Yi
bfd159e03a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours am: a547d62f78 -s ours 
am: 3e598ff5e1  -s ours

* commit '3e598ff5e1294276d5d6efdbee2bf706e318d547':

Change-Id: Ia6d76d76bf08687f5ebfff989270bac10eaa0ce3
 2016-06-03 17:45:52 +00:00
Bill Yi
3abb3eb426 Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours am: 5346695e1d -s ours 
am: 4a786994bc  -s ours

* commit '4a786994bc87957a2b25baae9e8c1c5d89d87273':

Change-Id: I6c84f1fde6f701851d1805399102280243e959fb
 2016-06-03 17:45:49 +00:00
Bill Yi
72713bef16 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours am: a1ba60ce29 -s ours 
am: 1a4e544ab9  -s ours

* commit '1a4e544ab9b9017421db7a032bb543c3070c8d7c':

Change-Id: I36d14b5103e5c0f38677b3a1d54070f97f035eb1
 2016-06-03 17:45:47 +00:00
Bill Yi
2b122897e9 Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours am: 337c1b1108 -s ours 
am: 9e14fb3c67  -s ours

* commit '9e14fb3c6733bdad087eb3fab7913f612e363bb7':

Change-Id: I0cb8df5f9a8693ddbefb0dd63ad1eeb8e5cfbf4b
 2016-06-03 17:45:45 +00:00
Sudheer Shanka
2590281320 Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 
am: 2a098206c4

* commit '2a098206c484cf94babaf717438ae72bd20b7009':

Change-Id: Iac96054c50e5b0e60a9adb27716f0523567dbb7b
 2016-06-03 17:44:34 +00:00
Bill Yi
166d6e9254 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours 
am: 1bef62e488  -s ours

* commit '1bef62e4880427e73dbbc6f95af4ae0454fbc772':

Change-Id: Icb0063153a530ec9127476c5d689a382653fd283
 2016-06-03 17:44:11 +00:00
Bill Yi
2a9bf18182 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours 
am: 85e1b30a61  -s ours

* commit '85e1b30a61c0da98a79ff6a5dc4faf0babd081e2':

Change-Id: Iebcf8d4966d03d0b6b6fae266f8e166f3c6cb4fb
 2016-06-03 17:43:54 +00:00
Bill Yi
3008905af3 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours 
am: d5d030af8b  -s ours

* commit 'd5d030af8b171adf7a91b14727c4c710da5908dd':

Change-Id: Iee7e393bfa099c6a009c1e5c0178432891c2e752
 2016-06-03 17:43:34 +00:00
Bill Yi
d4983475ad Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours 
am: 88fdea080f  -s ours

* commit '88fdea080fd9aa1ac2c31a8a2cb0ace3a0be924d':

Change-Id: I227274dd96491fa95ba34f4cc611a88f674ca5d8
 2016-06-03 17:43:26 +00:00
Treehugger Robot
104518e4c4 Merge "While turning OFF do not honor ON requests." 2016-06-03 17:42:38 +00:00
Sudheer Shanka
46333ca62a Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 8ebc6e80b8" into nyc-mr1-dev-plus-aosp 
am: c56c32172e

* commit 'c56c32172e5f2cc7775a6fadaa3990c5685e14c9':
  Avoid triggering support dialog in non-current user.

Change-Id: Ia9e7deb6bbd314d64ac2551241a73fbaad38b793
 2016-06-03 17:36:11 +00:00