tree b58f9bd2a60c2e3a51e6734acef7c3161ffb75ca
parent 95d59e56a6fe23ed160a59140d1a5dc0db7560c6
parent 4ada88aeb51620cbb1b53f51bcd014d708d7c9d1
author Meng Wang <mewan@google.com> 1467061673 +0000
committer android-build-merger <android-build-merger@google.com> 1467061673 +0000

Merge \"Fix compile warning in libril.cpp\" into nyc-mr1-dev
am: 4ada88aeb5

Change-Id: Ica2aaca0c7ba313ee3e97d627c10daa702896064