| commit | 5f60238c666333bed0b00c578cc219038f0da773 | [log] [tgz] |
|---|---|---|
| author | sachiyo <sachiyo@google.com> | Thu Jan 25 14:38:31 2018 -0800 |
| committer | sachiyo <sachiyo@google.com> | Thu Jan 25 14:38:31 2018 -0800 |
| tree | 6e630c89906ec30150aa93a813b1714f08bcc285 | |
| parent | 11e813b9fa28f512d503a4534c6e9965b31c6246 [diff] | |
| parent | 11e66338a17f9c3154758833549e11fc6864c9cf [diff] |
resolve merge conflicts of 11e66338a17f9c3154758833549e11fc6864c9cf to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I4977aac6e511008803707673ea08a3861bc0e3b4