| commit | 794bcd27ef0abffd01255dd11991e1bcacc954d7 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Jun 06 16:38:00 2017 -0400 |
| committer | Jason Monk <jmonk@google.com> | Tue Jun 06 16:38:00 2017 -0400 |
| tree | 07a78422b4203a60511ee357fec52f37229b7db9 | |
| parent | 1e61697d3cf7fdb77996c42e6938abb7307e33eb [diff] | |
| parent | be23ef368f1ac0476f8150267fa88d0a7b8f5b01 [diff] |
resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I5364727a21f62fc479c9bca6ad7ab2c3b62d1d1b