tree c8fd047f87d5ef98bead086c995acbdff74eeb4a
parent fb4ed9165428379823f1d1b423af49b3e71cce34
parent 230df4ab9c69358026634079c1dece849b10d2f0
author Jinhui Li <jinhui.li@intel.com> 1459317211 +0000
committer android-build-merger <android-build-merger@google.com> 1459317211 +0000

Merge "reference-ril/atchannel.c: Fix time conversion" am: 0bbaed7
am: 230df4a

* commit '230df4ab9c69358026634079c1dece849b10d2f0':
  reference-ril/atchannel.c: Fix time conversion

Change-Id: I02f358e240858166c4360b368b23c0dfdee67ff1