tree ccc7ab5522e8b02939aaa32e05c39f44d3650fab
parent e4f46314cc36b84383be304cdc29f98d9a42ec76
parent ea1dc9561d9cb372639a607a1253d126471c88c8
author Elliott Hughes <enh@google.com> 1519955024 +0000
committer android-build-merger <android-build-merger@google.com> 1519955024 +0000

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

Change-Id: I5fabd7475f16a6c3e841d239c7957eeaf81aea49