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

Change-Id: I84161628d6b7ccc47fc2a12074a1f26f2814a3ff


Trivial merge