tree 31346fa250cd257a63546a9f9f1a26de653293c7
parent 7644e3c4b7624f17af5735d811ad89d80895d95c
parent 7049d1b47e85bf99c0138059e8f54db4427e8a6d
author Amit Mahajan <amitmahajan@google.com> 1486073774 +0000
committer android-build-merger <android-build-merger@google.com> 1486073774 +0000

Merge changes from topics 'RADIO HAL 4', 'RADIO HAL 3' am: 39583c4634 am: f9544bce8d
am: 7049d1b47e

Change-Id: I615b99dc89a88698bf56fd8b8d3dd2c62a086cc3