From: Narayan Kamath <narayan@google.com>
Date: Tue, 5 Apr 2016 17:35:04 +0000 (+0000)
Subject: Merge changes I56b0a4dd,I85aa52cc into nyc-dev
X-Git-Tag: android-x86-7.1-r1~248^2~80^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ebae4bb0c951dafb4ce1a710bca2f94966f0eea;p=android-x86%2Fart.git

Merge changes I56b0a4dd,I85aa52cc into nyc-dev
am: 55338c9

* commit '55338c9f2c7d5c154ec28891ef655ae1514e4102':
  unstarted_runtime: Update references to decimal format classes.
  unstarted_runtime: Add additional cutouts

Change-Id: I98ddc3fc7ac20f1522312b74f0f02c6f03980b59
---

5ebae4bb0c951dafb4ce1a710bca2f94966f0eea