OSDN Git Service

am 03f8a4df: am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev
authorBaligh Uddin <baligh@google.com>
Sat, 6 Sep 2014 04:20:10 +0000 (04:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 6 Sep 2014 04:20:10 +0000 (04:20 +0000)
* commit '03f8a4dfb557ddd56014ed91824f080c82564042':
  Add java_args as a valid option


Trivial merge