tree 3a59492201b04a4f8687409f32fadd250e0c452a
parent 0eac39db9053bd3f417d113553d81e36acbbffcc
parent 436b740b705c4316d3d5b73f04cdff9b8b8714e8
author Christopher Ferris <cferris@google.com> 1412536805 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412536806 +0000

Merge "Do not call art-on macro by default." into lmp-dev