OSDN Git Service

resolve merge conflicts of c76a3ac to stage-aosp-master
authorGlenn Kasten <gkasten@google.com>
Wed, 17 Aug 2016 20:27:29 +0000 (13:27 -0700)
committerGlenn Kasten <gkasten@google.com>
Wed, 17 Aug 2016 20:28:04 +0000 (13:28 -0700)
commit67ffd5e61730d4074c174fa72fb752666cc8bbe0
tree94c43e292d8b72071eeec1aa6f8e4d06e16d56a4
parent9b36ce973e458125807b59c002d3a1602e0b800d
parentc76a3ac224833e7d3542f37543cfe4f63723e3f3
resolve merge conflicts of c76a3ac to stage-aosp-master

Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25