tree 3b0906f06cd56fe86f657c278ecde8f349af3931
parent 9199e7237615d31d943941f2b27c6f7709d88c05
parent 6a4a7e1d7130f5a3bf4b56a5bf5e897c4fc22713
author jeffhao <jeffhao@google.com> 1336423042 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336423042 -0700

Merge "Fix x86 compilation of const-wide." into ics-mr1-plus-art