OSDN Git Service

Merge "DO NOT MERGE Fix build" into lmp-dev
authorJaewan Kim <jaewan@google.com>
Thu, 22 Sep 2016 18:09:45 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 18:09:45 +0000 (18:09 +0000)
am: fce3b76452  -s ours

Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936


Trivial merge