tree e2a756d8a6dfd3c9dbf3cbbd011856c7577bf48a
parent e3ca9a2b6c64a975d56cbc01642ac9003325a283
author Han-Wen Nienhuys <hanwen@google.com> 1497973211 +0200
committer Han-Wen Nienhuys <hanwen@google.com> 1497973456 +0200

Apply 7fc542ed2590942edf757dfcc34a8a9aa926a258 across revert.

Change-Id: I38ffa06d746767febde777794691f4adec024aa1