| commit | 20dae868a8a78b478638ac56307b8f0584ef4d88 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Nov 14 10:03:00 2016 -0800 |
| committer | Tyler Gunn <tgunn@google.com> | Mon Nov 14 10:03:00 2016 -0800 |
| tree | ebdba2891f58c24cbb01d0ed3da8cde68757cf6f | |
| parent | c91cf52659552d305b47e4e2527defd149788813 [diff] | |
| parent | 7b821620a8daf33c9e387d1a19fb9a77af4425f1 [diff] |
resolve merge conflicts of 7b82162 to stage-aosp-master Test: build Change-Id: I1c114d0bd88f0ee91c384a5983146b2cd08ae08f