tree 53e21b812ffaf818896868a03b7421ca7317b757
parent c097d1f06e9701d326d693cbfa32ee7f9435f1fb
parent 3d2c90d18608650614cf3940179cf13251e82178
author Ying Wang <wangying@android.com> 1437771785 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437771785 +0000

am 3d2c90d1: am cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""

* commit '3d2c90d18608650614cf3940179cf13251e82178':
  Fix mmma uses like "mmma ./external/apache-harmony"