| commit | 1e00517d71603e9c2e2854bfbc7e3d99b78c4366 | [log] [tgz] |
|---|---|---|
| author | Jaesoo Lee <jaesoo@google.com> | Fri Apr 28 10:52:15 2017 +0900 |
| committer | Jaesoo Lee <jaesoo@google.com> | Fri Apr 28 10:52:15 2017 +0900 |
| tree | b0e15465810ef65fbab4e9553a7f0d45c1d22dff | |
| parent | 552a4c10b33dcd1e6c24ab11fd6c4d46b6cf4d26 [diff] | |
| parent | afc0aa78f4a513ab3fddd01a3fb6a03a401801cb [diff] |
resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I0e1cc5f5367c4840eea5f56670f74a44743f1853