tree 2d1302a97085cd9df67e17ed3a44b009cb5edf84
parent 26446eb6649d1a7bcac7346cb04a04cf425d3c22
parent c1ce11f67d195204464aa775cc495f0796cb0ce5
author Jorim Jaggi <jjaggi@google.com> 1464398460 +0000
committer android-build-merger <android-build-merger@google.com> 1464398460 +0000

Merge "Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 am: 031def9e8e" into nyc-mr1-dev-plus-aosp
am: c1ce11f67d

* commit 'c1ce11f67d195204464aa775cc495f0796cb0ce5':

Change-Id: I24ad460bb5bdbcf4f3d48e45dc4a45f0069d3fff