| commit | d0f89bf3df3ccbe1c8750e0ad1124c1bd2b61276 | [log] [tgz] |
|---|---|---|
| author | Zhengyin Qian <qianzy@google.com> | Wed Aug 17 13:23:17 2016 -0700 |
| committer | Zhengyin Qian <qianzy@google.com> | Wed Aug 17 13:23:17 2016 -0700 |
| tree | 88021c9f3ed6df2441d03c35a2c4e7ec72af1195 | |
| parent | 38f05d83278e971835c5b78d2067bc40c00a0ec5 [diff] | |
| parent | 068ecc731ec96f1fd1a0819dfed642c510ea69bc [diff] |
resolve merge conflicts of 068ecc7 to nyc-mr1-dev-plus-aosp Change-Id: I8b294812ae72df1cf430b592357a2634085a5c49