Amit Mahajan 4e36794b49 Merge "OMADM intent sent by both system and apps." into nyc-dev ...

am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
  OMADM intent sent by both system and apps.

Change-Id: Icd3a9e9b35a2f4c44269fef2bbbe8d6835d93990

2016-05-17 17:49:56 +00:00

..

android/telephony

Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev

2016-05-12 23:05:57 +00:00

com/android

Merge "OMADM intent sent by both system and apps." into nyc-dev

2016-05-17 17:41:11 +00:00