commit | dd0b80d0b0074499de9a1faa74f6927c30b44201 | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Tue Apr 04 15:26:21 2017 -0700 |
committer | Amit Mahajan <amitmahajan@google.com> | Tue Apr 04 15:26:21 2017 -0700 |
tree | fce3eb8b7610101c2835b0deb06601cf25b201c0 | |
parent | 0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522 [diff] | |
parent | 77eb76cebe41427191a8a384f4cb70417ce3dd3a [diff] |
resolve merge conflicts of 77eb76c to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic7897aba8a92273bd5939417628963ef2304556f