OSDN Git Service

resolve merge conflicts of 8547681 to nyc-mr1-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Fri, 19 Aug 2016 22:54:18 +0000 (15:54 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Fri, 19 Aug 2016 22:54:39 +0000 (15:54 -0700)
commit697040f5db4f2f87ee02342a26488883eb7503e5
tree2e25990ec71710412ff4e1bad1c2766013dbec8a
parent1a564cbcf0fce626c4c40799c9a2e754032dc832
parent854768185802a50f52df3cd2c8f65bf03b18cd75
resolve merge conflicts of 8547681 to nyc-mr1-dev-plus-aosp

Change-Id: I692c5f9e57dd53370377a9d926b905a6c8c2276d