OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
authorSudheer Shanka <sudheersai@google.com>
Wed, 24 Aug 2016 20:38:40 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:38:40 +0000 (20:38 +0000)
commitcdf70ba0a3c7d4fcfea0adbae9d6dd3f38678747
treef60633b7ed42f63f0bbc3e8de357adb43b0882ad
parentdfc2d0a4bcbae8880d684805de3715cc55057819
parenta0994c6d58bcdc1bcc7d8e60353f5b675c30bcee
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944
am: a0994c6d58

Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0