OSDN Git Service

am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
authorYing Wang <wangying@android.com>
Fri, 9 May 2014 16:50:05 +0000 (16:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 May 2014 16:50:05 +0000 (16:50 +0000)
commit96e487b262c2d5d7c02d49e29e71895588e15549
tree9b75518ead86bf362b700fb774b5628ebf04ef01
parenta6a2969e020ea16edbe24661d2b63f7f2bdf98b6
parent9889229133470c89acfb0083f8d5c62c29ea1d4e
am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"

* commit '9889229133470c89acfb0083f8d5c62c29ea1d4e':
  javac: rename common_flags to avoid conflictions