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

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul Jensen
0808eb8069 Include network name in validation logs for dumpsys 
Previously this was included in the log messages from NetworkMonitor
but that has been removed (ag/944107), making it frequently impossible
to know what network the logs apply to as there may be no way to
correlate NetIDs to WiFi SSIDs or Cellular networks if the log has wrapped.

Bug: 26075613
Change-Id: I2e3cd41fffb616ab9f855cb16790360bd3414793
 2016-06-03 13:51:21 -04: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
Bill Yi
4a1cee4013 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 81a108d038 -s ours" into nyc-mr1-dev-plus-aosp 
am: b48b0bc153  -s ours

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

Change-Id: I6ce6dad906a398ec59844be5ac452bd04773946b
 2016-06-03 17:36:03 +00:00
Bill Yi
1e6abe0a94 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 498f780f42 -s ours" into nyc-mr1-dev-plus-aosp 
am: 70f0bb3937  -s ours

* commit '70f0bb3937af9355a9aafcabc191b8991fae8ad2':
  Import translations. DO NOT MERGE

Change-Id: I6480fbbba287e92139a366d8b7cd113558153e42
 2016-06-03 17:36:01 +00:00
Bill Yi
4f164636a7 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours am: 7d627e9cf0 -s ours" into nyc-mr1-dev-plus-aosp 
am: 68254909b3  -s ours

* commit '68254909b326b91fd408f98fc80ed6114db7b078':
  Import translations. DO NOT MERGE

Change-Id: I1efc7c596d1eea858a18cd3bf1f46a49210a6954
 2016-06-03 17:35:59 +00:00
Bill Yi
6c79212afd Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: c29b39b95f -s ours" into nyc-mr1-dev-plus-aosp 
am: 95d6b19545  -s ours

* commit '95d6b195451419e24f190ee0d3286eed84ab227b':
  Import translations. DO NOT MERGE

Change-Id: Icd0e559f3e6bf7b17c44e5e04523d27eb72449e7
 2016-06-03 17:35:56 +00:00
Bill Yi
4761069d53 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 12d1f5d5c0 -s ours 
am: 774f4e43c5  -s ours

* commit '774f4e43c5c170d377be22d4181e4466504323f3':
  Import translations. DO NOT MERGE

Change-Id: Icc668bbb228ff5d2fb6b3b6bf5cf24eeb3703db1
 2016-06-03 17:33:40 +00:00
Bill Yi
39181238a7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3cfbe6e7ea -s ours 
am: 1761a87f90  -s ours

* commit '1761a87f90ead50ff822e0905c836b28580e111a':
  Import translations. DO NOT MERGE

Change-Id: I6347ef887cbded629a8b0fa70825ed22f0eada14
 2016-06-03 17:33:38 +00:00
Bill Yi
b6869f823e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7d84e110cb -s ours 
am: 2ac7d7f022  -s ours

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

Change-Id: I5186dd983d6146b1427b6fd8323a46d6505beb30
 2016-06-03 17:33:36 +00:00
Bill Yi
c8f08fd7f7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d8a450557e -s ours 
am: a27dbcb4a9  -s ours

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

Change-Id: I0362623f474ea9eb8d7581e4581226ee1c81bdb3
 2016-06-03 17:33:35 +00:00
Bill Yi
7333b0ddee Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: cb4bea3ae8 -s ours 
am: 25d12a4086  -s ours

* commit '25d12a408692f9267f20fa9b674516cf4b978331':
  Import translations. DO NOT MERGE

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

* commit 'abd7b12ada0f5f1c61ef9cec2ca13e199d6b2682':

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

* commit 'a547d62f787fc19f11447aebbb39bb3a109b9acd':

Change-Id: I3b9530bc3afbbe5a45ac406214534c7b7fe2f1a7
 2016-06-03 17:31:50 +00:00
Bill Yi
4a786994bc Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours 
am: 5346695e1d  -s ours

* commit '5346695e1dffebe8461ef9e2c005e6d595eefea3':

Change-Id: I0b804d6784edca40349c7a593235fe4b01e62956
 2016-06-03 17:31:41 +00:00
Bill Yi
1a4e544ab9 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours 
am: a1ba60ce29  -s ours

* commit 'a1ba60ce290894003a164a5e08d46a50f323532b':

Change-Id: I2c15fa3c3ee3ff7492b2c809d734866f8cac4e11
 2016-06-03 17:31:33 +00:00
Bill Yi
9e14fb3c67 Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours 
am: 337c1b1108  -s ours

* commit '337c1b110856328476341b405c31accacf6d48b2':

Change-Id: I826a96483a3120cb89337179c8438053992f7988
 2016-06-03 17:31:28 +00:00
Android Build Merger (Role)
c56c32172e Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 8ebc6e80b8" into nyc-mr1-dev-plus-aosp 2016-06-03 17:26:34 +00:00
Android Build Merger (Role)
b48b0bc153 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 81a108d038 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-03 17:26:22 +00:00
Android Build Merger (Role)
70f0bb3937 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 498f780f42 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-03 17:26:10 +00:00
Android Build Merger (Role)
68254909b3 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours am: 7d627e9cf0 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-03 17:26:01 +00:00
Android Build Merger (Role)
95d6b19545 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: c29b39b95f -s ours" into nyc-mr1-dev-plus-aosp 2016-06-03 17:25:51 +00:00
Sudheer Shanka
2771de2d56 Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 
am: 8ebc6e80b8

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

Change-Id: I3850b49c3814befd34ec04a9264889175de0c9e8
 2016-06-03 17:23:59 +00:00
Bill Yi
2fe87534dd Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours 
am: 81a108d038  -s ours

* commit '81a108d038245c756025f5ed439d02cbd71d685d':
  Import translations. DO NOT MERGE

Change-Id: I3f0bd2c2991404c5132ec5ab07e9ce184a0f9695
 2016-06-03 17:23:50 +00:00
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
774f4e43c5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 12d1f5d5c0  -s ours

* commit '12d1f5d5c0d9c1fbff66bd838c5d534893fba686':
  Import translations. DO NOT MERGE

Change-Id: Ibf1708ca58c41463210831363d4aa667a305a193
 2016-06-03 17:23:42 +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
1761a87f90 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 3cfbe6e7ea  -s ours

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

Change-Id: I4a2f25168a33676c7caf95765c004c71c333ecd8
 2016-06-03 17:23:38 +00:00