Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
45c3597975e70ac32f1de2406216c6917b57ce79
frameworks_base/services/devicepolicy/java/com/android
History
Jason Monk 45c3597975 resolved conflicts for merge of 8e6b5343 to master 
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
2014-08-18 11:05:17 -04:00
..
server/devicepolicy
resolved conflicts for merge of 8e6b5343 to master
2014-08-18 11:05:17 -04:00