Tyler Gunn 7a63216d83 Merge "Continued multi-endpoint work." into nyc-mr1-dev ...

am: beb8c4954d

* commit 'beb8c4954db199412a8e59b45198b0c2ac449bfd':
  Continued multi-endpoint work.

Change-Id: I1090df296dd4f0824202f5173e88ba8d6570db5f

2016-05-18 20:32:33 +00:00

..

android/telephony

Merge "Continued multi-endpoint work." into nyc-mr1-dev

2016-05-18 20:32:33 +00:00

com/android

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

2016-05-17 17:48:44 +00:00