| commit | 2050efcef8d40e1f37fa8d19e9146cc29dc64b75 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Sep 18 13:16:17 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 18 13:16:17 2014 +0000 |
| tree | 8b2ac8c8f5028d892b26d6ef81dc8f19e4c30a5d | |
| parent | 4bbae58cd2228ea883ff0ca5a917962ae1b6d1ae [diff] | |
| parent | 44df954fe8275cdad88c3d54a41c4d56937f929b [diff] |
Merge "resolved conflicts for merge of 6da664b2 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp