OSDN Git Service

Fix miscellaneous compilation errors am: f85869d923
authorPrashant Malani <pmalani@google.com>
Thu, 21 Apr 2016 01:35:31 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 01:35:31 +0000 (01:35 +0000)
am: 49ed8aac96

* commit '49ed8aac96c5c7b872dccb8906dd0b3fb327823e':

Change-Id: Iad43ff702c997090a39c09d619ae36b476e979dd


Trivial merge