Sanket Padawe a7f74b1d43 Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d ...

Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968

2016-06-02 17:20:08 -07:00

..

android/telephony

Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d

2016-06-02 17:20:08 -07:00

com/android

Merge "Add restricted card state to telephony manager." into nyc-mr1-dev

2016-05-25 21:39:12 +00:00