| commit | 919aa5ff8913e972050315dbd10fcaedb1143f6a | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Jun 14 22:27:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 22:27:42 2016 +0000 |
| tree | 61edc18e286468abe321d661f22d8e3222424e16 | |
| parent | 6ac8461b4504525971f5593b87808f4914f9a507 [diff] | |
| parent | 336f697941f2efd1d9ab9f5d45cc31e24e79b1b9 [diff] |
Merge \"Change test 149 to run for 10 seconds\" am: 336f697941 Change-Id: Icf9d860e6656a2f51a29df66992b906fbe58cef8