| commit | f9c6be3125adc889fb5e0ee84790372601fcf937 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Thu Aug 27 21:36:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:08 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 9d951b545503c1e6fb049dae682763210f9730a8 [diff] | |
| parent | 83f6470462e8bae8360e2263bfa9d0b47c0420a1 [diff] |
am 83f64704: am 7abdd81f: (-s ours) am 88365965: am 8103eca7: Merge "IOSchedule 2014 benchmark." into studio-1.4-dev automerge: ec0fe6f automerge: 7a726dd * commit '83f6470462e8bae8360e2263bfa9d0b47c0420a1':