OSDN Git Service

resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950
authorChristopher Tate <ctate@google.com>
Tue, 6 Dec 2016 00:13:48 +0000 (00:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 00:13:48 +0000 (00:13 +0000)
commit953c05276e5b50a437d5d6f3bc7b9a4b0941d702
tree8712dfd4670b4e7da1fe8dec1249ca2b4182133f
parent57dbf1c224be67afc296ef97b70b6a13647d4c83
parent02e4440eabb004f8d817599b68caf9dba7aa27bc
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950
am: 02e4440eab

Change-Id: I66e7e982176555f09bf298325754d708ef0ecac0