tree 90a1d67c97be325edd57a2b8491b0176a8aa737f
parent f7af7ed20bf448259b5b2b838c650ec443f428db
parent 7a1aa926109b090251d193426ba9fdc699e6f3b7
author Dianne Hackborn <hackbod@google.com> 1464135525 +0000
committer android-build-merger <android-build-merger@google.com> 1464135525 +0000

Merge "Fix issue #28931042: wtf in system server" into nyc-dev
am: 7a1aa92610

* commit '7a1aa926109b090251d193426ba9fdc699e6f3b7':
  Fix issue #28931042: wtf in system server

Change-Id: I84142fe627ae93b680577bff91327419715db4bb