From: Andreas Gampe <agampe@google.com>
Date: Wed, 18 Jan 2017 18:03:23 +0000 (+0000)
Subject: Merge "ART: Add GetJLocationFormat" am: 24e2ded0f9 am: e0f3ca5461
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9739537308e85265c8008ad5592d7999a50caf91;p=android-x86%2Fart.git

Merge "ART: Add GetJLocationFormat" am: 24e2ded0f9 am: e0f3ca5461
am: 421d20dd99

Change-Id: Icf0d004ae975b81924f28bdc0a852006c46687f1
---

9739537308e85265c8008ad5592d7999a50caf91