tree ae3ff05250aec80158ead2bdc5fc9ffcdeb1aa69
parent c534603f8d2a03e0ace678adc83d6194a7afdbe9
parent 61b040a57094093cfb090ebb1c321d4a69c20b64
author Yabin Cui <yabinc@google.com> 1433470725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433470725 +0000

am 61b040a5: resolved conflicts for merge of ea248d9c to lmp-mr1-ub-dev

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