OSDN Git Service

Merge "Fix fileslist for system other image" am: b05fe25b9f am: eb90e156e1
authorDan Willemsen <dwillemsen@google.com>
Fri, 24 Mar 2017 23:21:43 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Mar 2017 23:21:43 +0000 (23:21 +0000)
am: 60ff056b6f  -s ours

Change-Id: Ib69f2431a7c39247888f36b72feb7c1bec88ce4e


Trivial merge