OSDN Git Service

Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
authorTamas Berghammer <tberghammer@google.com>
Wed, 18 Jan 2017 20:33:44 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 20:33:44 +0000 (20:33 +0000)
commitc6e0e7553498157b4d558afc6deb02492c3d4f21
tree3661e04e49ebf14dfa406e630cac66a4def14cab
parentd331d57dc604ea016137df48bde8d954dbcb87f3
parenta553354e84f75ae256b71e6b6b3e96d85dd954f7
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
am: a553354e84

Change-Id: I7e969a4988bdc01f21f09137cfe2f8e692101a3c