OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf69115 29bb6ef)
am 29bb6ef1: am 12edfcad: resolved conflicts for merge of ee3d4d49 to mnc-dev
authorSimon Wilson <simonwilson@google.com>
Thu, 25 Jun 2015 00:33:17 +0000 (00:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 00:33:17 +0000 (00:33 +0000)
* commit '29bb6ef1b2d21248eb0d686932fb2487c923b7fe':
  Add switches for compressor


Trivial merge
system/extras
About OSDN
Find Software
Develop Software
Help