OSDN Git Service

resolved conflicts for 5b9b1b89 to stage-aosp-master
authorScott James Remnant <keybuk@google.com>
Mon, 19 Oct 2015 21:05:46 +0000 (14:05 -0700)
committerScott James Remnant <keybuk@google.com>
Mon, 19 Oct 2015 21:05:46 +0000 (14:05 -0700)
commitd0c2dd9dc9081ef9a7a2750d5a87eae5abc011ab
treec3021ec33fd98ca0477b4d0f92fca5d0f9a961bd
parent2bca3d2a1f37d3469080b931735a117a8e6451c0
parent5b9b1b89e900fd6f830d25965b1e6a20da559c7f
resolved conflicts for 5b9b1b89 to stage-aosp-master

Change-Id: I26781a825590a9effbc7d622391775b2eca58902