| commit | 1d336da880f583765c1ebb3f6d222bc96b55e5a2 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Tue Jul 24 19:52:22 2018 +0200 |
| committer | Martijn Coenen <maco@google.com> | Tue Jul 24 20:04:57 2018 +0200 |
| tree | 9f9155b4003af80e8d52d379d06c2c22e5c31108 | |
| parent | b4b293b0ec1ea5171beb66f27ed4eaeca2dca287 [diff] | |
| parent | 80894b606303eb9320a9969c1553d14ce0220dca [diff] |
resolve merge conflicts of 80894b606303eb9320a9969c1553d14ce0220dca to stage-aosp-master BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I7c36f66c4bf9129c1b421290f82bdae83be6979e Merged-In: If9dd6913868a34ea1e3d14fee1860a4ff368e06b