tree fc5f8e42a23865305168906995eb89057781de4f
parent a1f03967caf8036b6b928155dbc4a9696c465353
parent bf24de292afd24c288e5522f1d0082c9fb7ec268
author Chad Brubaker <cbrubaker@google.com> 1447102431 +0000
committer android-build-merger <android-build-merger@google.com> 1447102431 +0000

Merge "Whitelist getTimestamp from integer sanitization" am: 51cd9a441e am: 7095f87656
am: bf24de292a

* commit 'bf24de292afd24c288e5522f1d0082c9fb7ec268':
  Whitelist getTimestamp from integer sanitization