| commit | 37764c71a0ac79142f90bb112b6cabffb940b955 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Mar 27 14:21:09 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Thu Mar 27 14:27:42 2014 +0000 |
| tree | da5df0deab8f39cc70ee699db549a6cafa8e592e | |
| parent | f3ed9a21b83df1e1b4aa8d2cdd08114de3484b59 [diff] |
Cherry pick parts of f5df700e6ce. This is logically a part of the merge conflict resolution for 22d07464 to master. These files moved across git repositories. Change-Id: Id95bfa0bf503295f2c02a201f4bec5243d169ec4