commit | 7f047f02ad713305acf1de5db7d07792318d69c2 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Thu Jun 19 02:16:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 19 02:16:34 2014 +0000 |
tree | f3e32b95a7b27a5c5b9c4090515a7e9ed0964379 | |
parent | 5376c00db3b34f59c679911a950574ce87c822f6 [diff] | |
parent | 80f1fe5f7cc80b6f1da142c782ccbbad45d878a8 [diff] |
am 80f1fe5f: am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart" * commit '80f1fe5f7cc80b6f1da142c782ccbbad45d878a8': Switch from core to core-libart