| commit | 7e15c580852a1f18614396bc0f85f8e04d737d19 | [log] [tgz] |
|---|---|---|
| author | Naveen Kalla <mrnaveen@google.com> | Thu Jul 13 20:43:21 2017 -0700 |
| committer | Naveen Kalla <mrnaveen@google.com> | Thu Jul 13 20:49:08 2017 -0700 |
| tree | 8361bb22ad2aa26bf8ac3b8acbcc68a901899c3c | |
| parent | 7b8d8578de8846da89378735ca88d716bfd162e3 [diff] | |
| parent | b78661052c440067a67d73486c066b82b6326098 [diff] |
resolve merge conflicts of b78661052c44 to oc-dr1-dev-plus-aosp Bug: 62933474 Test: Build Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3 Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b