| commit | 9a7d31eb9c20b63ed4747a10c1f68e464d3c0914 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Oct 06 23:32:52 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 06 23:32:53 2014 +0000 |
| tree | a81290c1010ff02fb59130995b83aa0515b4170b | |
| parent | 2d04b5e09f08089df16f9d2603698470ff34add8 [diff] | |
| parent | d61d2b7b8037ba3f7eb97af545daaa3e267c2638 [diff] |
Merge "resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp