OSDN Git Service

am 12edfcad: resolved conflicts for merge of ee3d4d49 to mnc-dev
authorSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 23:53:04 +0000 (23:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 23:53:04 +0000 (23:53 +0000)
* commit '12edfcadb72e6a3a8349e7404a14fd71dccff6c4':
  Add switches for compressor


Trivial merge