André Lago 13a5df3b31 Merge changes from topic 'Different sound settings for work profile' ...

* changes:
  [media] Separate ringtones for managed profiles
  [Settings] Added setting SYNC_PARENT_SOUNDS

2016-08-19 17:02:05 +00:00

..

android

Merge changes from topic 'Different sound settings for work profile'

2016-08-19 17:02:05 +00:00

com

Fix a flicker when returning to the lockscreen am: d11d1a9486 am: afaf4ac7a9

2016-08-18 00:17:02 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…