OSDN Git Service

am 61b040a5: resolved conflicts for merge of ea248d9c to lmp-mr1-ub-dev
authorYabin Cui <yabinc@google.com>
Fri, 5 Jun 2015 02:18:45 +0000 (02:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Jun 2015 02:18:45 +0000 (02:18 +0000)
commite997e9155e72f1b0b40d832ac91fd39951acc1b9
treeae3ff05250aec80158ead2bdc5fc9ffcdeb1aa69
parentc534603f8d2a03e0ace678adc83d6194a7afdbe9
parent61b040a57094093cfb090ebb1c321d4a69c20b64
am 61b040a5: resolved conflicts for merge of ea248d9c to lmp-mr1-ub-dev

* commit '61b040a57094093cfb090ebb1c321d4a69c20b64':
  Make sys_resource test more robust.