OSDN Git Service

am 1bcdaa88: am 668b1bf8: resolved conflicts for merge of bd6c5577 to klp-modular...
authorAdam Hampson <ahampson@google.com>
Tue, 8 Apr 2014 17:44:03 +0000 (17:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Apr 2014 17:44:03 +0000 (17:44 +0000)
commit4f9498c285263656ae4f2a3b013f3281ad146301
tree890e945186ac7915c373d2c985fd4ecfa89aeec1
parentb903aca6e7863bc5e27af55504744e4305025694
parent1bcdaa88b249cdf49ba245a01108990c599e5664
am 1bcdaa88: am 668b1bf8: resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp

* commit '1bcdaa88b249cdf49ba245a01108990c599e5664':
  DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.