OSDN Git Service

am 91b9be73: am 0da09a02: Merge "Only allow whitelisted exceptions during dex2oat...
authorMathieu Chartier <mathieuc@google.com>
Mon, 7 Jul 2014 17:33:33 +0000 (17:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 17:33:33 +0000 (17:33 +0000)
* commit '91b9be73b5e39e07bedbdeddfb75a5fca2ec441c':
  Only allow whitelisted exceptions during dex2oat resolving.


Trivial merge