OSDN Git Service

resolved conflicts for ba95966e to stage-aosp-master
authorDan Willemsen <dwillemsen@google.com>
Mon, 28 Sep 2015 21:33:14 +0000 (14:33 -0700)
committerDan Willemsen <dwillemsen@google.com>
Mon, 28 Sep 2015 21:33:14 +0000 (14:33 -0700)
commit3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66
treebea6a7467c9ad110681eaac37537f72bb44888c7
parent536a38fe3317047e9b51813a04ae3a74c3df5d60
parentba95966e8bb579cdef665901617b76eadddb0ed9
resolved conflicts for ba95966e to stage-aosp-master

Change-Id: Id468b025222853e5a421300b6e669de999bf737e
libril/Android.mk
librilutils/Android.mk