| commit | 611c95a3f8d5bb9053fe6309ce1a1c99b346a12f | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Mon May 15 21:01:59 2017 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Mon May 15 21:01:59 2017 -0700 |
| tree | aa48ff36d14a1de54e79b6d2109f06e5a23fafad | |
| parent | e44086e27223f71dfd254302d1f7b5dfb0bb007c [diff] | |
| parent | be9844a03c668f51521a6553d13216d5d4aac66e [diff] |
resolve merge conflicts of be9844a03c to oc-dev-plus-aosp Change-Id: If7d78718d8f6349b9b386c30096bd83d8f94cbc9