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)
Change-Id: I8937cd33aa375824965d4f919038a99b30ab75ea


Trivial merge