OSDN Git Service

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

Change-Id: I8365e943aab82305fbc5775e8044dc7f014c0cdc


Trivial merge