| commit | b54660a8468372136b9a333dcb3855867156c878 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Oct 21 11:31:39 2016 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Fri Oct 21 11:40:54 2016 -0700 |
| tree | e5c65b3897ae065a32aa256c14b82e42206ace66 | |
| parent | 97349d34d6a28e2e128844c2eea7d1c09e5178ee [diff] | |
| parent | 91cc63afd81d8fd0ffcd191a6d46c9e917cc769e [diff] |
resolve merge conflicts of 91cc63a to master Test: None Bug: 31750617 Change-Id: Iace66f74cc0624064e536ef98707701f8e060701