OSDN Git Service

Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 25 Aug 2016 23:41:48 +0000 (23:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Aug 2016 23:41:50 +0000 (23:41 +0000)

No differences found