OSDN Git Service

resolved conflicts for 95ac6dbb to mnc-dr-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 15 Oct 2015 01:41:36 +0000 (18:41 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 15 Oct 2015 01:41:36 +0000 (18:41 -0700)
commit845dd0266b90b0e71699d07c1a0cf1ed5d1d50f4
treef0a3a229dda644b7dc8b7aee8cde8c8eacc7537a
parentc70d479dc618dc62299bfdef2d18c2c68da582c1
parent95ac6dbbb23da4967221c3077a10635b1626b031
resolved conflicts for 95ac6dbb to mnc-dr-dev-plus-aosp

Change-Id: I8937cd33aa375824965d4f919038a99b30ab75ea