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)
commitfea9feb30e7f86850161fe41cde8b746bc7df27b
treecf03c3cd1915ac8f296b9bfadf33cd0ce6f6489d
parentcca29c7284c60f0c33d1dfefccd793c337d1e6f2
parentd57565864b5c1774e18d34889e09e8151d195044
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev