| commit | d7dbeee22d39f5906c4b39b0388fd7e9320b402e | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Jun 14 22:30:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 22:30:18 2016 +0000 |
| tree | 61edc18e286468abe321d661f22d8e3222424e16 | |
| parent | 0537eaa94d185851d426802cf0d08e4c8d4c1578 [diff] | |
| parent | 919aa5ff8913e972050315dbd10fcaedb1143f6a [diff] |
Merge \\"Change test 149 to run for 10 seconds\\" am: 336f697941 am: 919aa5ff89 Change-Id: Id0fb553aca63a6bbdba82b887aa7059de56d1aee