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
Andrew Solovay
bec732d0a4 docs: Quick release-notes fix am: 29329dd3f1 am: 1f279c1ab0 
am: eddf9bfc36

* commit 'eddf9bfc36aea60736695c3da9264414d7629ceb':
  docs: Quick release-notes fix

Change-Id: I27b568b1e6de8b60a4a5496617de8b02c58edfbc
 2016-05-18 18:16:58 +00:00
Baligh Uddin
1eae1647ec Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ac773c8f7 -s ours 
am: c0ec896186  -s ours

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

Change-Id: I50d2a935ff251eb11335c9a7c04c32cf93c7c6d6
 2016-05-18 18:12:29 +00:00
Baligh Uddin
8674e4a436 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: eb93f0668c -s ours 
am: 659e607049  -s ours

* commit '659e60704920b7fafa865fef1a7262dd1994f1e6':
  Import translations. DO NOT MERGE

Change-Id: Ib7772068baa3eaa1235eb17de0fb3470d8833083
 2016-05-18 18:12:26 +00:00
Baligh Uddin
e142b4f9ce Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 06994e5e8c -s ours 
am: 99687a6400  -s ours

* commit '99687a6400142454ca38917ada79b4491cd97f35':
  Import translations. DO NOT MERGE

Change-Id: I5c14251bed900acab5477386255ff3d033219ef6
 2016-05-18 18:12:20 +00:00
Baligh Uddin
80bdfe0508 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 123637175e -s ours 
am: be3189b6b3  -s ours

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

Change-Id: If1af3974a8965961a6ca4f628f85b0f1cbef4683
 2016-05-18 18:12:12 +00:00
Baligh Uddin
8e37e6b37e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 576a32da20 -s ours 
am: 1e3d25cc5b  -s ours

* commit '1e3d25cc5bbe92c76703b5651624c482c56482d5':
  Import translations. DO NOT MERGE

Change-Id: I925a1e240e6831071384b1273e86477b91c1bfb4
 2016-05-18 18:11:42 +00:00
Baligh Uddin
eea586c60d Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb6e5df633 -s ours 
am: 613174e144  -s ours

* commit '613174e1446ce137e8f7cd457dfcbf471703bfc3':
  Import translations. DO NOT MERGE

Change-Id: Idbe89404af42ccc5c54ec7da5e66558e857bad00
 2016-05-18 18:11:37 +00:00
Baligh Uddin
f358f770a2 Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6ee2d7e11 -s ours 
am: d2308ffe10  -s ours

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

Change-Id: I799ecb9bc13d8369b3d14eef2949da6f54e3723f
 2016-05-18 18:11:31 +00:00
Michael Wright
eea825d67e docs: Fix attr link in support lib docs. 
This issue was breaking the build in nyc-docs; Michael made the fix
there, so I'm cherrypicking it back to our doc branches.

Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
(cherry picked from commit ae316f8424)
 2016-05-18 18:08:30 +00:00
Andrew Solovay
eddf9bfc36 docs: Quick release-notes fix am: 29329dd3f1 
am: 1f279c1ab0

* commit '1f279c1ab030fb78ba193d9b91999bc8d98ae300':
  docs: Quick release-notes fix

Change-Id: Ic785186da0288b565c5ee4fca4b748290aa640e7
 2016-05-18 18:08:18 +00:00
Baligh Uddin
c0ec896186 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 5ac773c8f7  -s ours

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

Change-Id: I52f42bcf1cfd40e4c90e17ae15651954d01915e6
 2016-05-18 18:04:49 +00:00
Baligh Uddin
659e607049 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: eb93f0668c  -s ours

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

Change-Id: I0c1c999903a7f1d54c3fa44b26ea77d16a2d59f0
 2016-05-18 18:04:45 +00:00
Baligh Uddin
1e3d25cc5b Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 576a32da20  -s ours

* commit '576a32da207ec435aa466985c827bc56709db5eb':
  Import translations. DO NOT MERGE

Change-Id: Ia3f0a81f0595a1d7f3f24ef1576bd20842da6420
 2016-05-18 18:04:41 +00:00
Baligh Uddin
99687a6400 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 06994e5e8c  -s ours

* commit '06994e5e8c77fea7f16283590656bceffd9d7c11':
  Import translations. DO NOT MERGE

Change-Id: I9f0acc75e5f4300ac1cf3133668531d070b34274
 2016-05-18 18:04:39 +00:00
Baligh Uddin
613174e144 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cb6e5df633  -s ours

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

Change-Id: Ia751f6dae4c9a0d2ad4193d269b5745d7c303b7e
 2016-05-18 18:04:36 +00:00
Baligh Uddin
e71736cd68 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 576a32da20  -s ours

* commit '576a32da207ec435aa466985c827bc56709db5eb':
  Import translations. DO NOT MERGE

Change-Id: Ia94fd9edaeef8625d85988d42cd56547a0bbdcd0
 2016-05-18 18:04:34 +00:00
Baligh Uddin
be3189b6b3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 123637175e  -s ours

* commit '123637175e0127672a8fa8c52c155abd8dd0dae6':
  Import translations. DO NOT MERGE

Change-Id: Ib14f9450c24ebe600c582b5dbc43fde082d09be3
 2016-05-18 18:04:34 +00:00
Baligh Uddin
d2308ffe10 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: e6ee2d7e11  -s ours

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

Change-Id: Iff406a441f1bcf9ed234cbd2aab8803c5b7d8fd9
 2016-05-18 18:04:31 +00:00
Baligh Uddin
d17ac6f18f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cb6e5df633  -s ours

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

Change-Id: I1b809754ebd93b4e45786a0b22b6d24940d3a6cd
 2016-05-18 18:04:30 +00:00
Baligh Uddin
c3190d5fb2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: e6ee2d7e11  -s ours

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

Change-Id: Icbd5a05067e61eb95513823ad9f90840dd1f0674
 2016-05-18 18:04:27 +00:00
Andrew Solovay
1f279c1ab0 docs: Quick release-notes fix 
am: 29329dd3f1

* commit '29329dd3f154bf33f1a2c85b0f49ad232d6f1dcc':
  docs: Quick release-notes fix

Change-Id: If1c368952b60be8df8457c38e4d4e7a4ac22e525
 2016-05-18 18:04:08 +00:00
Baligh Uddin
5ac773c8f7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:28 +00:00
Baligh Uddin
576a32da20 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:26 +00:00
Baligh Uddin
eb93f0668c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:21 +00:00
Baligh Uddin
cb6e5df633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:19 +00:00
Baligh Uddin
06994e5e8c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:14 +00:00
Baligh Uddin
123637175e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:54:36 +00:00
Baligh Uddin
e6ee2d7e11 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:54:34 +00:00
Bert McMeen
3abd77b094 Merge "docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f am: 7d9f487457" into nyc-mr1-dev-plus-aosp 
am: 9fb2bbba45

* commit '9fb2bbba45f4fe814c28d652a10a108dda286d7c':

Change-Id: Ic7a9647cf2e04ce8e47d1d4052d28ef9f916603a
 2016-05-18 17:53:47 +00:00
Baligh Uddin
9540cfff67 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:51:52 +00:00
Baligh Uddin
c560f5718e Merge "Import translations. DO NOT MERGE" 2016-05-18 17:50:27 +00:00
Baligh Uddin
880d4296f1 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:49:51 +00:00
Android Build Merger (Role)
8475cb0def Merge "docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f am: 5dfa27c64c am: e9b5b203ec" 2016-05-18 17:49:45 +00:00
Bert McMeen
a2636b6ef1 docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f am: 5dfa27c64c 
am: e9b5b203ec

* commit 'e9b5b203ec030310a5908669352c921156ab2d47':
  docs: Downloads change for 'I' build

Change-Id: Ia86811a8afc6445c55affeee39cb42cd5ca4d1b8
 2016-05-18 17:49:21 +00:00
Baligh Uddin
a8db92fac5 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:49:06 +00:00
Baligh Uddin
7fcdb10ca9 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:55 +00:00
Baligh Uddin
160e36f5c0 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:40 +00:00
Baligh Uddin
d4e70720ef Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:35 +00:00
Baligh Uddin
b1926daaab Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:32 +00:00
Baligh Uddin
8b5adafff9 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:26 +00:00
Android Build Merger (Role)
9fb2bbba45 Merge "docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f am: 7d9f487457" into nyc-mr1-dev-plus-aosp 2016-05-18 17:46:14 +00:00
Bert McMeen
0ceb54526f docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f 
am: 7d9f487457

* commit '7d9f487457f78af3fbf5b0afdf0999b9e3524694':
  docs: Downloads change for 'I' build

Change-Id: I31e044a2fa5adecba058f27868b0352e601457ee
 2016-05-18 17:45:45 +00:00
Bert McMeen
e9b5b203ec docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f 
am: 5dfa27c64c

* commit '5dfa27c64c125b2a93ff00e5cf2124d9bcbebe3e':
  docs: Downloads change for 'I' build

Change-Id: Ia2f50d3311ca2543013f6a0f5d3149a13d579a83
 2016-05-18 17:45:40 +00:00
Bert McMeen
5dfa27c64c docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 
am: 51136f409f

* commit '51136f409f62f0623d8014bae132e4c9edfe1366':
  docs: Downloads change for 'I' build

Change-Id: Iaca8f84cfc84ae506db3d79ad246d930d82ad920
 2016-05-18 17:42:47 +00:00
Bert McMeen
7d9f487457 docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 
am: 51136f409f

* commit '51136f409f62f0623d8014bae132e4c9edfe1366':
  docs: Downloads change for 'I' build

Change-Id: I68f037b13c2a02dc2a3c34027f13f5300078ebe4
 2016-05-18 17:42:42 +00:00
Bert McMeen
51136f409f docs: Downloads change for \'I\' build am: 90433cf4d8 
am: 996c9839d6

* commit '996c9839d657ddb98c5c69f902cd33d45bea7663':
  docs: Downloads change for 'I' build

Change-Id: I027756f3e51efdd81e01f2a2fbe268044ca3c9b5
 2016-05-18 17:37:17 +00:00
Bert McMeen
996c9839d6 docs: Downloads change for \'I\' build 
am: 90433cf4d8

* commit '90433cf4d8de469568202a7ca15a14d76db73f2a':
  docs: Downloads change for 'I' build

Change-Id: I9230b82f48d391245882150af67c949e6ae102dc
 2016-05-18 17:32:01 +00:00
Andrew Solovay
29329dd3f1 docs: Quick release-notes fix 
DD asked to pull this sentence out. See first comment for doc stage
location, but if it builds and stages without trouble I'll go ahead
and submit.

Change-Id: Ie9844cf60bfd723dea8dbfd42eb04465dde84ae3
 2016-05-18 10:29:52 -07:00
Sudheer Shanka
1d697775e7 Merge "Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev am: 0d902adbbc am: 6c505ecdd6" into nyc-mr1-dev-plus-aosp 
am: 0353b3e1d1

* commit '0353b3e1d10beb5de059fa7fa679789223c17b18':

Change-Id: I6820ad9fd717012f70ebaa5e3daafa609f88dcab
 2016-05-18 17:23:36 +00:00
Sudheer Shanka
773cbc0da1 Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: db9d529499 
am: d412dfc2a8

* commit 'd412dfc2a80166038e8ea17759dfdfc1b03b419d':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I021b42322aed96471559574aa7d6af63ced784b4
 2016-05-18 17:23:31 +00:00