OSDN Git Service

Merge "Fix malformatted preference xml." into oc-dev am: 569a93b8bb
authorFan Zhang <zhfan@google.com>
Wed, 19 Apr 2017 22:13:53 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 22:13:53 +0000 (22:13 +0000)
am: 0a9fddd631

Change-Id: I9aa9f77d224fdd63ec4c2222c510d1958e4f7166


Trivial merge