| commit | 2759e6033d19c03ad44b5496e760a7f4cb28fa80 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri May 30 11:24:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 30 11:24:05 2014 +0000 |
| tree | e1d0539cc81e58413692db01d40091c873af8b89 | |
| parent | 0e4aa8db3fcbe91cbbe76db291424fb271b7749c [diff] | |
| parent | a856c6f543c71f6778cdb9b39f6049ae8b2c4e53 [diff] |
am a856c6f5: (-s ours) DO NOT MERGE Fix lmp-preview-dev after bionic merge. * commit 'a856c6f543c71f6778cdb9b39f6049ae8b2c4e53': DO NOT MERGE Fix lmp-preview-dev after bionic merge.