tree d4c0c6859e5c5cb72b33f7ffc70628f409d49378
parent 01d5a146e20660bd06f026c16f19ec080f8fdd7b
author Tim Murray <timmurray@google.com> 1401749168 -0700
committer Tim Murray <timmurray@google.com> 1401749168 -0700

DO NOT MERGE

Merge ART from AOSP to lmp-preview-dev.

Change-Id: I0f578733a4b8756fd780d4a052ad69b746f687a9