tree 93c739851fcc5e5efaa0f52bc64f89dbc39a03a9
parent 3c46a5260aba2b42a1a4b2399168dd155d37c52f
parent 9459b5c45b0ad33bea9376c2afb66cf93da610ac
author Wink Saville <wink@google.com> 1370641605 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370641605 -0700

am 9459b5c4: Merge "Fix enum field references with java_multiple_files."

* commit '9459b5c45b0ad33bea9376c2afb66cf93da610ac':
  Fix enum field references with java_multiple_files.