tree 85c8017324e2357c479e01bef23304dc922aafed
parent cabb2669def2d32d5fd93b2fa6b8a036da0b3e70
parent e6f7481631c1fd7a0d36d4515cf56f6c64e48267
author Deepanshu Gupta <deepanshu@google.com> 1440719376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440719376 +0000

am e6f74816: (-s ours) am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit 'e6f7481631c1fd7a0d36d4515cf56f6c64e48267':