| commit | 40fde78c652a6d65772bb0ff9e2c734562cb2d48 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Sun Jul 05 17:08:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 05 17:08:23 2015 +0000 |
| tree | 858cf00b2ccf89ea80590f4baf4f6dbc2d65c0e2 | |
| parent | 3a2d590bcf0ffb4f2e92e9b322236bacd0341297 [diff] | |
| parent | cc8efebe6bf52e37fe078973989557801101a88b [diff] |
am cc8efebe: (-s ours) resolved conflicts for merge of 61a2b205 to master * commit 'cc8efebe6bf52e37fe078973989557801101a88b': Update emulator prebuilts to support EXT4 cache partitions.