tree 80fce345a9f97378cae616854a48061e220b5502
parent 272a7a31c814dbd3e372ae124e0cb6d0b034fdc0
parent 4cdf1c4e7007afbe89f61dd9cb7b0980d55480a5
author Brian Carlstrom <bdc@google.com> 1403143145 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1403137084 +0000

Merge "Switch from core to core-libart"