| commit | f68cfd92bafb49f848f36c92ba9c8b65390e4620 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Jan 13 10:33:59 2017 -0800 |
| committer | Tyler Gunn <tgunn@google.com> | Fri Jan 13 18:38:32 2017 +0000 |
| tree | af862ec7ecb4f8a8952efc8330bcf27671dfa006 | |
| parent | 84a50e41cfaa44e98abb886d65db317da868bfa2 [diff] | |
| parent | 49056668fa783371610d5d5295a5049dc5cba2db [diff] |
resolve merge conflicts of 49056668f to nyc-mr2-dev-plus-aosp Merged-In: I42b78fd27fe9814c4f8e29afc8937c3b41f51e50 Test: Build Change-Id: I9132a85010117f1742778bcccb2d2ccde7b0785e