tree 9b75518ead86bf362b700fb774b5628ebf04ef01
parent a6a2969e020ea16edbe24661d2b63f7f2bdf98b6
parent 9889229133470c89acfb0083f8d5c62c29ea1d4e
author Ying Wang <wangying@android.com> 1399654205 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399654205 +0000

am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"

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