| commit | f839bbedd7025e9925188c87540add774809d471 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Tue Jun 19 09:24:13 2018 -0700 |
| committer | David Gross <dgross@google.com> | Tue Jun 19 10:00:21 2018 -0700 |
| tree | 132a1ab38a2a36967fbc46c567fc7b299a25790c | |
| parent | 6a2dc249c70bd359ccb114a5f656b676b0f02dc0 [diff] | |
| parent | 2a970cb851cf10115cc876190c03e0e049167ee3 [diff] |
resolve merge conflicts of 2a970cb851cf10115cc876190c03e0e049167ee3 to stage-aosp-master BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I587517c463d2d334f1f16eb614923d06d2dcaaaf