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:40:32 +0000 (22:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 22:40:32 +0000 (22:40 +0000)
commit5b649ddcc6634c77031122f8de00679336e4581d
tree108088e1c65c6a011d66dc7dcbfed130c6b741fe
parentafab98a69ed9c1d7d2f520ab4838199078be834b
parent1ab448b5d5258df927b43b9fe03c485b16431f3a
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65  -s ours am: 2cd4383c31 am: 09edfde074
am: 1ab448b5d5

Change-Id: I4a1da4793ef9c53447742ea9e1f7a34fbffb8807