tree ab8dcd5249e82ba33d7147d21cc2c41036c6d012
parent 656a6b9e3645bfe2cf073b69cbb9d02832f62c26
parent 4afb57b5dbd45e787255a634a241c44749642e4a
author Colin Cross <ccross@android.com> 1374688416 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1374688417 +0000

Merge "add static dependency on liblog"