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)
commit29bb6ef1b2d21248eb0d686932fb2487c923b7fe
tree31801142fc73f8a127869ef6122394779a96dcf5
parent4c489d6c77443461a1faa9a00f71188abad9fb19
parent12edfcadb72e6a3a8349e7404a14fd71dccff6c4
am 12edfcad: resolved conflicts for merge of ee3d4d49 to mnc-dev

* commit '12edfcadb72e6a3a8349e7404a14fd71dccff6c4':
  Add switches for compressor