tree 9646afaf437a21344e7352de57038856209b6132
parent 200dbc5feae56a31f455a50780133cf515fae0ed
parent a5afbe8ac666615058e200ecf8fbc4908eadb95d
author Torne (Richard Coles) <torne@google.com> 1377855669 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1377855671 +0000

Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-dev