tree 79fc42ae8eeefc19234ed5bbd1b22f7a96b28a79
parent 284a2b4ace4f3bbf7bcb79e7109b2a4bca6a3cdd
parent 3c16439700d7379c96da99188d25e3a9ae1264ed
author Pete Gillin <peteg@google.com> 1550241792 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1550241792 +0000

Merge changes I00d3f12c,Ia4b25dae

* changes:
  Revert an unnecessary diff vs upstream in Throwables.java.
  Add Android-changed markers to Throwable.