tree 456650ffe425e113f71f0a21b2fffc79cc6f31fb
parent 6984b8188bf3ea75d1edd5b6c1153580d8ff0a33
parent b2c368c82a28686cb0d514fe234abd43a93e4270
author Brian Carlstrom <bdc@google.com> 1403143133 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1403131679 +0000

Merge "Switch from core to core-libart"