OSDN Git Service

resolve merge conflicts of 2810aed to nyc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Fri, 13 May 2016 19:14:13 +0000 (12:14 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Fri, 13 May 2016 19:14:13 +0000 (12:14 -0700)
commiteeac121a960dfd0ccaacd71de1e90ef750caf60c
treed20096d6856460a0f389725db9117b53f60b1c93
parentdc9fcd959eaeb8ead21b317eba6d535ca90154da
parent2810aedf960ad3acd70f74fae40bd471484e5c3c
resolve merge conflicts of 2810aed to nyc-dev-plus-aosp

Change-Id: I18d9434f0921a1297436859a0b2b284b5750f9b1