tree f57194c6967e03d765873021a3e42c38bec9879b
parent 5b5a3cd72012f242743906ed18dfd1f1eac217e8
parent 37648a2b6a8943d643d5a2b93dd1cf97acf24ab3
author Linux Build Service Account <lnxbuild@localhost> 1437482826 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1437482826 -0700

Merge changes I55bfcddf,Ida0c2251 into private_master

* changes:
  FM: Disable QCT FM app
  FM: Build libfmjni by default