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 21:56:51 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 21:56:51 +0000 (21:56 +0000)
commit2cd4383c316b894bd10191f64c1394df1d2c1b0d
tree2db764a9415ce0b7161a573dc842de56a951fa3b
parente9a9e2f0559fdd8dd31222e14ac87df1d49ad583
parent585f642d65b8b277d72e7628bbe8bc360282de25
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79 am: 462493ee81
am: 585f642d65  -s ours

Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14