OSDN Git Service

resolve merge conflicts of 6df58d8da10d to oc-dr1-dev am: 6e40562a73 -s ours am...
authorfionaxu <fionaxu@google.com>
Mon, 18 Sep 2017 18:36:44 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Sep 2017 18:36:44 +0000 (18:36 +0000)
commite21e491f0ec7c80fe9f935485cedfd13565727bd
tree7e814e50a1359fd545bab5290d46e18d78933f0a
parent64c31a374edf381735f64988c8ed3f8f3bc3321a
parentac5aac788b0b07f6c9b9f309764d1cb41b98b437
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev am: 6e40562a73  -s ours am: 0318d4ec91
am: ac5aac788b

Change-Id: I0262866304f69250cbf94862e780c791b14a9fe4