| commit | 63fa599fef0383b41f85e1fc3a38d33c4434e24a | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Sep 20 14:08:49 2017 -0700 |
| committer | Tyler Gunn <tgunn@google.com> | Wed Sep 20 14:08:49 2017 -0700 |
| tree | f6b1b0b122e00969b827b6590d1a3e0bcc7b6ea1 | |
| parent | f8a779c333287135d04a950292dc53e506c3b9c7 [diff] | |
| parent | 214a3eb16a55b25784b87d035f284d47dd642cc3 [diff] |
resolve merge conflicts of 214a3eb16 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Id750164d7ed0d0966a2125394924630c30d25a6a