| commit | 415606056c8a1c70e1817c15c0d4c71f395aeed6 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Oct 25 19:53:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 25 19:53:27 2014 +0000 |
| tree | 631f292f06f13d22620bfd68f94ab1e55b717cf4 | |
| parent | 2a279e626791cec6d0af518139dab8e29f1ca263 [diff] | |
| parent | de3948664086ebdb61f8eba02597925805633d65 [diff] |
am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev * commit 'de3948664086ebdb61f8eba02597925805633d65':