| commit | 04f5233cb7eb425f66bd9d30b9d66bc737521618 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Mon May 01 16:37:49 2017 -0700 |
| committer | Tomasz Wasilczyk <twasilczyk@google.com> | Mon May 01 16:38:39 2017 -0700 |
| tree | d21b51d3d35191321dcf2c9f7888ae97924d075e | |
| parent | adbb8870648905ee64f4ebc72f61010967ee3c57 [diff] | |
| parent | b28bdeefe25a69d9dd2d9c7adfa11b9aadb7baad [diff] |
Merge commit 'b28bdeefe25a69d9dd2d9c7adfa11b9aadb7baad' into manual_merge_b28bdeef Bug: 37512442 Bug: 37159108 Test: it builds Change-Id: I96a78d45e9f63f82a0b0b904c1ecdcd8fe4ff564