OSDN Git Service

am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid...
authorYing Wang <wangying@android.com>
Fri, 9 May 2014 16:54:38 +0000 (16:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 May 2014 16:54:38 +0000 (16:54 +0000)
commit38e49504efe2b52195eca19da63e000c2eceed0d
tree6aa30045859734f9af092c19e27cd6c2d95d97f4
parent0cd5ec5b16c02d1d435f550c45e3500899081e12
parent96e487b262c2d5d7c02d49e29e71895588e15549
am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"

* commit '96e487b262c2d5d7c02d49e29e71895588e15549':
  javac: rename common_flags to avoid conflictions