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

Change-Id: If3673b1525e74be33567803d08e91a711488b265


Trivial merge