| commit | fd1c998237da395af546e0e3143a4133f966559b | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sun Nov 04 18:27:38 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Nov 04 18:27:38 2018 -0800 |
| tree | 88ca0b6a2a5ecc67f6b06b37b6eedc3a1aaca58d | |
| parent | df0ddbbb401d4043f06a1e605882563ac0714c3d [diff] | |
| parent | acc9d5b878c452013d1ebddcf5c6989da7aa27f7 [diff] |
Merge "Adapt to google::protobuf::uint64 type change" am: b8fd364d0a am: 5e349ea3f6 am: acc9d5b878 Change-Id: I7ad39c2ceac035a76f73762182883a4cd6d34334