tree ccc7ab5522e8b02939aaa32e05c39f44d3650fab
parent 717d40607c1c1dbb503c22abc625fed2e66cc829
parent 22eb0a61dd604f4c9485f27f07d67ba97797090a
author Elliott Hughes <enh@google.com> 1519954693 +0000
committer android-build-merger <android-build-merger@google.com> 1519954693 +0000

Merge "Document the strptime %s change." am: 66e49c0503
am: 22eb0a61dd

Change-Id: Ia25c3fc4f77618740b0703daa4017b11ef62e76d