| commit | dcde9315ee275f54bb08d8b6306872b6f3ed4b9e | [log] [tgz] |
|---|---|---|
| author | Kirill Grouchnikov <kirillg@google.com> | Mon Jun 01 21:43:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 21:43:35 2015 +0000 |
| tree | 89ec194a53587af14bb4581ab5ac668da7ed50c5 | |
| parent | a827125615dd187a03421fe56a0d1e7454582c67 [diff] | |
| parent | fcafc3d4599a37340e986130206b056f80d3c4da [diff] |
am fcafc3d4: (-s ours) am eb8c8932: (-s ours) DO NOT MERGE ANYWHERE. * commit 'fcafc3d4599a37340e986130206b056f80d3c4da': DO NOT MERGE ANYWHERE.