OSDN Git Service

resolve merge conflicts of c76a3ac to stage-aosp-master am: 67ffd5e617
authorGlenn Kasten <gkasten@google.com>
Wed, 17 Aug 2016 21:10:59 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 21:10:59 +0000 (21:10 +0000)
commitd21cb15584f9b28315c4237197188340f32dbdb8
treebc872eb53622cc3569cb99f9dc9a5e046ab379a6
parent4a414edfed2d8ce78036ee0412e43cb06cc6b474
parentf7b4fd24e3b1f48814ded0fdc694cbfb305d365a
resolve merge conflicts of c76a3ac to stage-aosp-master am: 67ffd5e617
am: f7b4fd24e3

Change-Id: Ib06db403955ae0056c1fee0e09f9249d0b887ea1