tree 1c9f5af4ae245178677daf01de64b1453a044e5f
parent e2c2eea6aa71e70705f257d6de0c6b736c7e7833
parent 9da4055766fc7acf81dcd238204589ea1f484d50
author Nicolas Geoffray <ngeoffray@google.com> 1447949104 +0000
committer android-build-merger <android-build-merger@google.com> 1447949104 +0000

Merge "Update framework code after new ART options." am: d7d2817ade
am: 9da4055766

* commit '9da4055766fc7acf81dcd238204589ea1f484d50':
  Update framework code after new ART options.