OSDN Git Service

resolve merge conflicts of b7f64bc to stage-aosp-master
authorMarie Janssen <jamuraa@google.com>
Wed, 22 Jun 2016 22:39:47 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 22:39:47 +0000 (22:39 +0000)
commitbd0d8060e059c6d6e03690fe3e3119201567b3e3
treefd0193d128f746b2809efd2a89ebfd7297abd7dc
parentd395be3fc571ee2889f41fd095e80e849d30ee8d
parent649e13fbfb2e7f20ffbb20a8d296e708fb235993
resolve merge conflicts of b7f64bc to stage-aosp-master
am: 649e13fbfb

Change-Id: I74fb93559793619a604f7ab442b0274ed3e3fd27