Merge "Update runtime hints for master and Nougat" am: c29c5a7b35 am: d25e6dcca6...
authorKalle Raita <kraita@google.com>
Thu, 30 Mar 2017 21:18:30 +0000 (21:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 21:18:30 +0000 (21:18 +0000)
am: f01815f17d

Change-Id: I71819c9a6289c5318a3c5a3ca8d5691eba81e30a


Trivial merge