| commit | 47966cecbbacbb08a399ba8cb6bd81bccb760921 | [log] [tgz] |
|---|---|---|
| author | Joel Galenson <jgalenson@google.com> | Thu Jul 27 09:50:25 2017 -0700 |
| committer | Joel Galenson <jgalenson@google.com> | Thu Jul 27 17:18:04 2017 +0000 |
| tree | 824644687c17e04af536d84e5236fc424da96fc0 | |
| parent | 1bc17b611b4fe2284a41857d5eca87e54f6b0d23 [diff] | |
| parent | 27c0aa7a425f85b9b38f4c8cc9858bfc2cb45b9c [diff] |
resolve merge conflicts of 27c0aa7a to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Merged-In: Ia28707ec565a0792bc882fbffe9e8ab9968535f5 Change-Id: I1f087fe5e7a71761a16673331619f52998473b44