OSDN Git Service

DO NOT MERGE: Revert "Fix build" am: a0a908f5d6
authorTamas Berghammer <tberghammer@google.com>
Wed, 18 Jan 2017 22:13:02 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 22:13:02 +0000 (22:13 +0000)
am: 0a1a0e6e61  -s ours

Change-Id: I9d4ecca39800413fa9eb483715bf810028d61334


Trivial merge