Merge "Update runtime hints for master and Nougat" am: c29c5a7b35 am: d25e6dcca6...
authorKalle Raita <kraita@google.com>
Tue, 22 Aug 2017 21:08:04 +0000 (21:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:08:04 +0000 (21:08 +0000)
am: f01815f17d

Change-Id: Ifd5134dac00a50376de3b7ed3693091c7e0e2a02


Trivial merge