| commit | 23328be805adafcce1146ce91d65b032c4736256 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Mar 06 01:39:08 2014 +0100 |
| committer | David 'Digit' Turner <digit@google.com> | Thu Mar 06 01:39:22 2014 +0100 |
| tree | d13188108ec61bc8a8eba0b104518ae1cf5f8eb4 | |
| parent | 312b1eb7c4df2b0dbc90576675a6c83fc9c43ca8 [diff] | |
| parent | 4a218a8b31d712290dce83cc65fc0a529fb10823 [diff] |
Resolve merge conflicts of 4a218a8 to master. Conflicts: emulator/qtools/Android.mk Change-Id: Ibde8886543893ce78892da57a6ab9f1fc8678432