| commit | 35276a6696fb25adb613411b0f5b5d4b6869ab05 | [log] [tgz] |
|---|---|---|
| author | fionaxu <fionaxu@google.com> | Thu Jun 22 12:11:02 2017 -0700 |
| committer | fionaxu <fionaxu@google.com> | Thu Jun 22 12:20:52 2017 -0700 |
| tree | 3cd3f4e0449212bfb4d9a3e3e19e4a1f90b4d0ac | |
| parent | 4ba0f3ef07f5220644ee8ecf22df8650c716bd25 [diff] | |
| parent | 187fe9d5cf3caab5a6f25e6802dee637f00187a9 [diff] |
resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9