| commit | 30acc25eb94b635f7b2924deb3d9be3d9812ed3c | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Sep 20 10:26:47 2017 -0700 |
| committer | Dmitry Shmidt <dimitrysh@google.com> | Wed Sep 20 10:26:47 2017 -0700 |
| tree | 003580652a9611802a8db7a021fdb843515a5bcd | |
| parent | b84b68279bd7c27ef6e2ff3fa923e8e99deb7650 [diff] | |
| parent | c313d91abf4a23db14ffe1d7b38d843dfca24b9f [diff] |
resolve merge conflicts of c313d91 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I3620c62a8e685536699027f21414002994420396