tree 2bfd05752781815306c115e40aab2b5fef10dfd0
parent c404bfb072f9273beb13bf8e098e2a4aa108f18b
parent b56812165dd3a2e6eb8b85c810943b3d7bd9bfc4
author Brian Carlstrom <bdc@google.com> 1364679693 -0700
committer Brian Carlstrom <bdc@google.com> 1364679693 -0700

Merge branch 'dalvik-dev' of https://googleplex-android.googlesource.com/a/platform/art into fixes-for-art-build-with-mr2

Change-Id: Ie46d1f77f98b8a6f55f02b8614cb88b36b6a2d44